Merge "Update code to match new CarUiRecyclerView design" into sc-v2-dev