am 85be8992: am b0a8d2c4: Merge "Fixed a potential bug where the keyguard could become empty" into mnc-dev

* commit '85be8992a989b5bd1a4aa953c42a6b8acaae9675':
  Fixed a potential bug where the keyguard could become empty