Merge "UI Improvement: Do not add archived app icon to workspace when unarchival starts in case the icon already doesn't exist." into main