Merge "Fix unsafe concurrent access in LegacyTypeTracker"