Merge "Clean-up WindowState if exit animation is done before app finishes" into nyc-dev