Merge "Fix scrolling in WidgetsBottomSheet" into sc-dev