Merge "Fix occasional odd scrolling behavior"