Merge changes from topic "am-097d6789-c880-4ec5-bad4-39f2d31eb938" into ub-launcher3-master

* changes:
  [automerger] Fixing crash when cancelAnimaiton happens while we are aboutto enter long-swipe am: 1d82dd4d12
  Fixing crash when cancelAnimaiton happens while we are aboutto enter long-swipe