Merge "Mark RecyclerView as scroll container" into lmp-mr1-ub-dev