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

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