Merge "Avoiding updating task via scroll if RectF spring animation is running" into tm-dev