Merge "Remove synchronized lock in MdnsServiceTypeClient" into main