Merge "Fix a race condition where the icon directory gets deleted after a successful archiving installs." into main