Merge "Fix leak of inspectorClient when INSPECTOR disabled"