Merge "Move WindowStateTests into flaky one"