Save and select button not placed correctly

Problem/Motivation

When using the media library to upload a new media entity the "Save and select" button is part of the content, so if the form for the media entity has multiple fields then the user needs to scroll down to see the buttons, they will only see the "Insert" and "Cancel" buttons and when they click on insert the modal is closed and no media is added.

Steps to reproduce

• Enable the Gutenberg Experience for a content type.
• Go to create a new content using Gutenberg.
• Add a Media block, and click on media library button.
• In the Add file field choose a file.
• You should see the Save and select button as part of the form and the Insert and Cancel buttons in the modal footer
• Click on Insert.
• Modal will close, no media will be added to block.

Proposed resolution

Use a similar approach than Drupal core by replacing the buttons when the new media form is presented to the user, so the user should see the Save and select button there.