Merge "Revert "Update smoothScrollToPosition to move faster for large offsets""