Merge "Make RecyclerView's adapter lock less strict" into mnc-ub-dev