Merge "InputMapper refactor: SensorInputMapper" into udc-dev