Merge "Fix restore of RecyclerView scroll position"