Merge "msm: kgsl: Wait for the shorter wait timeout value"