Merge "Add pip2 flag check into some WM tests" into main