Merge "Remove TODO to move MediaKeyDispatcher to apex" into main