Merge "Clean up the sampling profiler"