Issue #3046007 by Sam152, alexpott, amateescu, tim.plunkett: In some...

Issue #3046007 by Sam152, alexpott, amateescu, tim.plunkett: In some circumstances the override field is not cleared from the field map when a bundle is deleted, resulting in a fatal error in layout_builder_post_update_make_layout_untranslatable

(cherry picked from commit 13cbe411)