Merge "Fix stuck windows in multi-window" into nyc-dev