Merge "Fixed test failures of WindowTest"