Merge "Fix RecyclerView to recyle invalid scrap properly"