Merge "InputMapper refactor: SensorInputMapper"