Merge "Better preserve focus on RecyclerView resize" into lmp-mr1-ub-dev