Merge "Do not stop window if preserving the window" into nyc-dev