Merge "Use same margins for widgets bottom sheet as all apps." into main