Merge "update intent to be toggle instead of show for hvac button"