Merge "[mdns] clean up unused serviceInfo ref in discovery requests" into main