Merge "Add more checks around archived shortcut restore" into main