Merge "Revert "Replace hidden KeyEvent.isMediaKey() usages""