Merge "Make LegacyTypeTracker testable" into qt-dev