Merge "Fix keyguard wake-up issue."