Prevent premature window replacement.

maybeRemoveReplacedWindows is called when any window
has reported drawing, we have to verify that we have
actually ourselves drawn, before commencing the replacement.

Bug: 26668339
Change-Id: Iabfc2e813989381f9f20f3bb111100911405686b