Merge "Update smoothScrollToPosition to move faster for large offsets"