Merge "Handle sub view focus in RecyclerView" into lmp-mr1-ub-dev