Merge "Fix fastscroll thumb"