am 773c2238: (-s ours) am 1c4c740d: am 97e77627: Merge commit \'9dd2663d\' into mm

* commit '773c2238f34022ebdb3a888d3d68caa2d67fb223':
  DO NOT MERGE. Add new media navigation keys.