Merge "Revert "msm: kgsl: Enable SPTP power collapse""