Merge "Revert "Always send KEYCODE_MEDIA_PLAY_PAUSE""