Merge "Fix logic error in SensorInputMapper::createSensor" into udc-dev