Merge "Remove unused widgets_scroll_container layout" into sc-dev