am 09abd164: am 2222a508: Merge "Fix problem where PhoneWindowManager waits...
am 09abd164: am 2222a508: Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev
* commit '09abd164':
Fix problem where PhoneWindowManager waits for keyguard to draw