Merge "Exclude RecyclerView children from save state" into lmp-mr1-ub-dev