Merge "Fix FastScroller jumping in recyclerView" into main