Merge "Fix assorted FastScroller regressions" into klp-dev