Merge "InputMapper refactor: SwitchInputMapper"