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

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

Change-Id: Iea34cbe633b93344bc73fbc741b9c381b461832d