apply patch from #13, with fixes from #14

Ben Stallingsrequested to merge
issue/entity_browser-3191302:3191302-make-modal-iframe into 8.x-2.x

Closes #3191302

Merge request reports