am a74cf4f9: am 280dc0ea: Merge "Fix assorted FastScroller regressions" into klp-dev

* commit 'a74cf4f962bbd8ae421b56d875f931806afa13ea':
  Fix assorted FastScroller regressions