Merge "Clean up the locks around Heap::VisitObjects()."