Merge "[Archiving] fix app links restoration" into main