Merge "Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c am: 0bca8d35" into nyc-mr1-dev-plus-aosp