Merge "Archived install icon fixes." into main