Merge "Fix NPE inside REcyclerViewFastScroller" into sc-dev