Merge "Fix broken AbsListViewTest" into sc-dev