Merge "msm: kgsl: No fault tolerance if userspace sets a flag"