Patch #84 works with 8.9.x as well, please ignore #88 re-roll.
I have applied...

Patch #84 works with 8.9.x as well, please ignore #88 re-roll.

I have applied #84 and it seems to be working, however if we use this patch along with layout_builder_modal module, it introduces an issue where modal popup on layout while adding or updating block does not close.

Steps to reproduce:

• On fresh drupal install apply the patch #84
• Install and enable content_lock and layout_builder_modal module
• You can enable content lock for layout by visiting admin/config/content/content_lock.
• Go to layout builder page of a node and add a block ,a modal popup will open
• Try to save the modal, the data in the background saved but modal popup does not close.