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

* commit 'bc8f826739390f853420afb2c54d3d098b67f663':
  Remove replaced window if we aren't animating its exit.

Change-Id: I2509dd7213f11c34968971f750e40118cce6ae1b