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