Merge "Handle media key events correctly on Keyguard."