Merge "Simplify wake management code in keyguard."