am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev

* commit 'c48c9626bd2eb91aab33a034baf139aa2b92671d':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""