Merge "Handle simultaneous connect of devices with the same "type" (as in USB)"