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