Merge "Don't show keyguard until the device has been provisioned." into klp-dev