Merge "Fix testTraverseAllWindows with waterfull cutout" into sc-v2-dev