Merge "Fix NPE in RecyclerView" into sc-dev