Merge "[DO NOT MERGE] Update controls icon" into sc-dev