Merge "Fix FastScroller regression for non-UI threads"