Merge "Attempt to fix invisible Keyguard #2" into lmp-dev