Don't expose private SensorInfo class in public SensorQuery interface
Instead move it to private and allow Sensor and SensorTreeModel access.