Merge "Revert "Revert "Restrict InspectClass to current thread."""