Merge "Revert "WindowTracing: fix deadlock"" into main