Merge "Adds aconfig flag for new archiving icon" into main