Merge "Disable predictive animations when span count changes" into lmp-mr1-ub-dev