Merge "Perf: Fix counts across power collapse" into msm-3.4