Fix bug in handling multiple controlIds from the same provider getting
merged together.