Merge "Measure WidgetsBottomPicker again when the number of spans changes" into sc-dev