Merge changes from topic "am-e78dd5f36dfc4491b11bd1600b0dca17" into main

* changes:
  [automerger skipped] Merge "Bugfix: Allow shortcut and widget services to update shortcuts and widgets across all launchers during archival." into 24D1-dev am: e7a400e9 -s ours
  [automerger skipped] Bugfix: Allow shortcut and widget services to update shortcuts and widgets across all launchers during archival. am: 991a6dff -s ours