Preserve block content structure when adding enhanced UI controls

berlinerrequested to merge
issue/layout_builder_ipe-3620545:3620545-enhanced-ui-changes into 1.0.x

Closes #3620545

Merge request reports