Merge "Fix a flicker when window is removed during entering animation" into nyc-dev
am: a285fdeb16

* commit 'a285fdeb160e822a2e1fe2fb6bd80ce91afcf181':
  Fix a flicker when window is removed during entering animation

Change-Id: I3d09de9be00d4181587dc0d1ef8a66aa1f7ebb3b