Merge "Fix some issues with smooth scrolling ListViews"