Merge "Don't dismiss boot messages before keyguard is ready" into lmp-dev