Merge "Exact common layout from widgets bottom sheet" into sc-dev