Merge "Perf: Re-enable counters after power collapse" into msm-3.4