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