Remove service surface in WMClient if service surface vanishes