Merge "Remove Windows-specific code from Trace.h" into main