Merge "ObjPtr<>-ify UnstartedRuntime, fix 2 stale reference uses."