Merge "msm: kgsl: Wait longer for CX headswitch off"