Merge "Fix a flicker when window is removed during entering animation" into...
Merge "Fix a flicker when window is removed during entering animation" into nyc-dev am: a285fdeb am: 8f6a9ca5
am: 8926e452
* commit '8926e452':
Fix a flicker when window is removed during entering animation
Change-Id: I2dd41625d485fbc49909bb23340c1ac9dc472c3a