Merge "Fix multi-window enter animation" into nyc-dev