am: b9d2502e * commit 'b9d2502e': Prepare to replace windows across recreate(). Change-Id: Ia144fd6e15340d062d659903548e48121c43f8c4