Merge changes I2516e8d2,I6c4f5c93 into sc-v2-dev

* changes:
  Don't expand the keyguard if it's fading away.
  Don't play screen off animation if we are upside down unless that's allowed.