Merge changes Iba4ca370,I8f7d6a45

* changes:
  Remove some keyguard methods out of ShadeController
  Move dozing related methods out of ShadeController