Merge changes from topic "am-9c344f02471b44ed9568e831ab1673bc" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into tm-dev am: 43dc334d am: 3f0fc1f2 -s ours am: ff85060e -s ours am: c4af475c -s ours am: 43e011dd -s ours
  [automerger skipped] RESTRICT AUTOMERGE Clear app-provided shortcut icons am: cfead1ab am: 8206ccd8 -s ours am: 39caf127 -s ours am: 06e3e65a -s ours am: f461ccf9 -s ours