Merge changes I3454e773,I1e01dc35 into msm-3.0

* changes:
  msm: kgsl: Make sure SLUMBER is the requested state
  msm: kgsl: Clarify the circumstances to enable SLUMBER state