Merge changes from topic "am-1bd72703-9d0a-4008-8efb-93b1471e2812" into ub-launcher3-master

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