Merge "Controls UI - Support RangeTemplate and TemperatureControlTemplate" into rvc-dev