Merge "Clean up ScopedThreadStateChange to use ObjPtr"