Merge "Fix a race when removing from LegacyTypeTracker." into mnc-dev