Merge "Refactoring before adding a new view type in the WidgetsListAdapter" into sc-dev