Merge "Wait for the router port activation before deletion"