Merge "Make RecyclerView requestDisallowInterceptTouchEvent(true)" into lmp-mr1-ub-dev