Merge "Prioritize delete animation over move animation" into lmp-mr1-ub-dev