Merge "Removing separate Cancel and End callbacks and using AnimationListener instead" into ub-launcher3-master