Merge "Merge "Fix a flicker when window is removed during entering animation"...
Merge "Merge "Fix a flicker when window is removed during entering animation" into nyc-dev am: a285fdeb am: 9bee2874" into nyc-mr1-dev-plus-aosp
am: 65e4448d
* commit '65e4448d':
Change-Id: Id6baba3888a2968989a4f352ad6939195da55632