Merge "Simplify some package update logic around restoring archived/unarchived shortcuts" into main