Merge "msm: kgsl: GPU fault tolerance timer"