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: I160f49ab3b0bf1ea77f38a1cbc0ae493577860d4