Merge remote-tracking branch 'origin/4.6'

Author: OstafinL

src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig

@@ -551,13 +551,19 @@
                 show_close_btn: true
             } only %}
         </div>
+        <div class="ibexa-field-edit__distraction-free-mode-extras">
+            {{ ibexa_render_component_group('distraction-free-mode-extras', {}) }}
+        </div>
         <div class="ibexa-field-edit__distraction-free-mode-control-container">
             <div class="ibexa-field-edit__distraction-free-mode-label">
                 {{- form_label(form) -}}
             </div>
+<<<<<<< HEAD
             <div class="ibexa-field-edit__distraction-free-mode-extras">
                 {{ ibexa_twig_component_group('distraction-free-mode-extras', {}) }}
             </div>
+=======
+>>>>>>> origin/4.6
             <div class="ibexa-field-edit__distraction-free-mode-btns">
                  <button {{ (fieldtype_is_not_translatable or disabled) ? 'disabled' }} type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__distraction-free-mode-control-btn ibexa-field-edit__distraction-free-mode-control-btn--enable">
                     <svg class="ibexa-icon ibexa-icon--tiny-small">