Merge changes from topic "am-f8e0f95e-5a5d-4e77-907e-df4f9f942952" into ub-launcher3-master

* changes:
  [automerger] Fixing some swipe animations for multi-window am: 8c36e3c747
  Fixing some swipe animations for multi-window