Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev