Merge "Improve synchronization of ProcessCpuTracker" into main