Merge "Ensure iconScale never exceeds 1." into sc-dev