Apply patch from oandregal

src/wp-includes/block-editor.php

@@ -311,7 +311,6 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
 		array(
 			'css'                     => 'variables',
 			'__unstableType'          => 'presets',
-			'__experimentalNoWrapper' => true,
 		),
 		array(
 			'css'            => 'presets',

src/wp-includes/default-filters.php

@@ -563,6 +563,7 @@
 add_action( 'enqueue_block_editor_assets', 'enqueue_editor_block_styles_assets' );
 add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' );
 add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_format_library_assets' );
+add_action( 'enqueue_block_editor_assets', 'wp_enqueue_global_styles_css_custom_properties' );
 add_action( 'admin_print_scripts-index.php', 'wp_localize_community_events' );
 add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
 add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );

src/wp-includes/script-loader.php

@@ -2863,3 +2863,14 @@ function wp_add_iframed_editor_assets_html() {
 
 	echo "<script>window.__editorAssets = $editor_assets</script>";
 }
+
+/**
+ * Function that enqueues the CSS Custom Properties coming from theme.json.
+ *
+ * @since 5.9.0
+ */
+function wp_enqueue_global_styles_css_custom_properties() {
+	wp_register_style( 'global-styles-css-custom-properties', false, array(), true, true );
+	wp_add_inline_style( 'global-styles-css-custom-properties', wp_get_global_stylesheet( array( 'variables' ) ) );
+	wp_enqueue_style( 'global-styles-css-custom-properties' );
+}