Merge "Fix RecyclerView crashed problem" into main