Merge "Invalidate for scrolling animations on the animation timer"