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: 3c9bbf4d
* commit '3c9bbf4d':
Change-Id: Iceaf9cce8f27768905c0bd88b61a813d325dfbeb