Merge "Prepare to replace windows across recreate()." into nyc-dev