Merge "Don't start the keyguard until boot is done." into lmp-dev