Merge "InputMapper refactor: SwitchInputMapper" into udc-dev