Merge "msm: kgsl: After timeout check if timestamp has retired" into msm-3.4