Merge "InputMapper refactor: JoystickInputMapper" into udc-dev