Merge "Perf: Check perf activity on correct CPU"