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