Merge "Fix invisible Keyguard" into lmp-dev