Merge "Update All set screen icon" into sc-dev