Merge "Use WidgetSizes to estimate widget size instead of custom calculation" into sc-dev