Merge "Removing some properties out of AnimationBuilder" into ub-launcher3-master