Merge "Map reference remote control to a single key-layout file" into sc-dev