Merge "Fix blank Keyguard #4" into lmp-dev