Merge "Add sensorLocationX/Y and sensorRadius to SensorProps"