Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into sc-dev