am: 0bca8d35 * commit '0bca8d35': Prepare to replace windows across recreate(). Change-Id: I86f3e04209e93316d100567ccf9b649d9c73213f