Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev