Merge "Add accessibility shortcut icon into adaptive icon" into sc-dev