Merge "Close SystemPerformanceHinter trace tags correctly" into main