Merge "Move media key handling to here." into jb-mr2-dev