Merge "Fix flaky testForAllWinddow"