Merge "Add unarchival error dialog." into main