Merge "Fix end state when animating launcher after swipe up from an app" into ub-launcher3-master