Merge "Fix a flicker when window is removed during entering animation" into nyc-dev