Merge "Revert "Add icon for "Extra dim" used in accessibility shortcut"" into sc-dev