Merge "Apply WindowTestRunner to more WM tests"