Merge "Do not reset the previous state animation, if it is a part of the new state animaiton" into ub-launcher3-master