Merge "Restore drag&drop from WidgetsBottomSheet" into sc-dev