Merge "[mdns] fix the logic of finding the existing service" into main