Fix scrollTo animation.
Merge conflicts.