Merge "Merge "Prepare to replace windows across recreate()." into nyc-dev am:...
Merge "Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c am: 0bca8d35" into nyc-mr1-dev-plus-aosp
am: bba3fff9
* commit 'bba3fff9':
Change-Id: I4348305917f0488583a944f03efbd45a69b5915b