Merge "[mdns] Skip conflict check for incoming mDNS answer records which are probed in the repository" into main