Merge "Only activate FastScroller when it's needed" into klp-dev