Merge "Fix a programmatic smooth scroll bug" into kitkat