Merge changes from topic "am-783afe5f-3535-4bbb-b942-8ecc2e7bd96a" into ub-launcher3-master

* changes:
  [automerger] Cleanup swipe detector in case of double cancel am: fa6cbbe15b
  Cleanup swipe detector in case of double cancel