Merge "Update the computation of the widget span from size" into sc-dev