Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev