Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev