Merge "Make TransactionProfiler show the actual query times"