Merge "Widen the scope of ViewHolder#getAdapterPosition" into lmp-mr1-ub-dev