Merge "(2nd try) Rename {add|remove}UniqueIdAssociation by appending ByPort suffix" into main