Merge "Only call register_service_clients if there are clients"