Merge "Adds new bugfix flag for using new app archiving icon" into main