Merge "InputMapper refactor: KeyboardInputMapper" into udc-dev