Merge "Remove replaced window if we aren\'t animating its exit." into nyc-dev am: c26aabadc3
am: 5a8e2b210a

* commit '5a8e2b210ac523b32dc5125524d35f005751dbe4':

Change-Id: I0fed1d158bcca7cd0936e44a92f7e85f8738f443