Merge "Delay restoring RecyclerView layout state until adapter is non-empty" into lmp-mr1-ub-dev