am 18eee4be: Merge "Move media key handling to here." into jb-mr2-dev

* commit '18eee4be72ec99495ec5b583aa07fda5dde6dacc':
  Move media key handling to here.