Merge "Only configure the transaction profiler if profiling is enabled"