Merge "Change layout anim from Animation => Animator" into ub-launcher3-master