Merge "RecyclerView: fix ArrayIndexOutOfBoundException in removeAndRecycleScrapInt" into lmp-mr1-ub-dev