Merge "Fix SensorUseDialog UI issues" into main