Merge "Fix heap size tracing during bulk thread-local allocations."