Merge "Add current clients to servicediscovery dumpsys" into main