Merge "msm: kgsl: Fix skipping aperture programming"