Merge "Revert "Fix RecyclerView crashed problem"" into main