* commit '613fffcd0f17eecb0231fe24f7abf7936eef8d37': Revert "Revert "Attempt to fix keyguard missing bug""