Merge "Save inner RecyclerView's state" into pi-car-dev am: 525c96765d
am: 44b30179ab

Change-Id: I487a107a7fb8513534ec071ada1ae862e6708827