Merge "Revert^2 "Restore Archived Pinned Shortcuts instead of removing them."" into main