Merge "Linking swipe animate to stateTransition to that it gets properly reset afterwards" into ub-launcher3-edmonton