Merge "Remove the ServiceTypeClient after socket destroyed"