Merge "Fix Keyguard crash when in landscape." into lmp-preview-dev