Merge "Add support for ThumbnailTemplate inside TemperatureControlTemplate" into main