Merge "Notifying listeners when a subnet gets added or removed"