am 7b7ef437: Merge "Don\'t start the keyguard until boot is done." into lmp-dev

* commit '7b7ef437e5b46d1173a7458ada6520778284c91a':
  Don't start the keyguard until boot is done.