[automerger] Fix bug where floating view is removed before window animation is complete. am: 53246e5fdc

Change-Id: I1b8f651b200396819bbf9c1caee799b2d1f325e8