Merge "Moved the scrolling logic away from the onDraw"