Merge "Revert "msm: kgsl: Add per context timestamp"" into msm-3.0