Merge "Fix app window detection on WM traces"