Merge "Bugfix: Ensure archived app icons persist when app main activity name changes post unarchival." into main