Merge "[Thread] fix ServiceDiscoveryTest" into main