Merge "Fix multi-window enter animation" into nyc-dev
am: 0c54d2c391

* commit '0c54d2c391b6d781fc660646e731f562bcd7037f':
  Fix multi-window enter animation

Change-Id: I89b75e2ab9b8fa5a628e77ed9ebd09b70f6a2dc4