Merge "Synchronize all WindowTestsBase and WindowTestUtils methods." into pi-dev