Merge commit 'dafe18ee8c8d7923580b0d6d03d44ffdb00372e6'

* commit 'dafe18ee8c8d7923580b0d6d03d44ffdb00372e6':
  Make sure we wake up the screen if the keyguard is not visible when we think it should be.