Merge "Fix bad RecyclerView issue"