apply patch and suggested changes

Ben Stallingsrequested to merge
issue/entity_browser-3300147:3300147-only-one-image into 8.x-2.x

Closes #3300147

Merge request reports