Merge "Fix some smooth scrolling bugs in lists and update on the animation timer."