Merge "Ensure the key events are handled by PhoneWindowManager"