4800de0f7c
* commit '93c736b3daa9b715814dd20892c1f41b5348f575': Revert "Revert "Attempt to fix keyguard missing bug""
* commit '93c736b3daa9b715814dd20892c1f41b5348f575': Revert "Revert "Attempt to fix keyguard missing bug""