Merge "Fix sampling profiler race condition"