Merge "[pm/archive] allow changing sharedUserId on unarchive" into main