Merge "Fix the IllegalArgumentException from RecyclerView"