Merge "Ensuring that previous animation is completed before starting a new state animation" into ub-launcher3-master