am 18108fd6: am 1362ec74: Merge commit \'62ec2dd5\' into mm

* commit '18108fd6837fffff1b7c1db418d44bc7644911f1':
  DO NOT MERGE Add new media navigation keys.