Merge "Clear controls in the temp list after using them" into sc-dev