Merge "Use callback to update sensor properties" into udc-dev