Merge "Simplify the logic in the hasServiceTypeClientsForNetwork" into main