Merge "Update logic for toast app icons" into sc-dev