Merge "SF: Reject hotplugs on invalid or duplicate ports" into main