am 0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been drawn." into klp-dev

* commit '0e823a450a729a753fb8e0618474b6ae3cf3b810':
  Keyguard isn't visible if it hasn't been drawn.