Merge changes from topic "am-3e098e52-a5e6-4050-ac05-724b2c56ff1d" into ub-launcher3-master

* changes:
  [automerger] Linking swipe animate to stateTransition to that it gets properly reset afterwards am: cc35bb88da
  Linking swipe animate to stateTransition to that it gets properly reset afterwards