Merge remote-tracking branch '36325/keep_add_image_btn_when_using_multiple_file_image_form' into commprs_feb

Author: engcom-Charlie

app/code/Magento/Ui/view/base/web/templates/form/element/uploader/image.html

@@ -12,7 +12,7 @@
     <div class="admin__field-control" css="'_with-tooltip': $data.tooltip">
         <div class="file-uploader image-uploader" data-role="drop-zone" css="_loading: isLoading">
             <div class="file-uploader-area">
-                <input type="file" afterRender="onElementRender" attr="id: uid, name: inputName, multiple: isMultipleFiles" disable="disabled" />
+                <input type="file" afterRender="onElementRender" attr="id: uid, name: inputName, multiple: isMultipleFiles" disable="disabled">
                 <label class="file-uploader-button action-default" attr="for: uid, disabled: disabled" disable="disabled" translate="'Upload'"></label>
                 <label
                     data-bind="event: {change: addFileFromMediaGallery, click: openMediaBrowserDialog}"
@@ -43,7 +43,7 @@
 
             <each args="data: value, as: '$file'" render="$parent.getPreviewTmpl($file)"></each>
 
-            <div if="!hasData()" class="image image-placeholder" click="triggerImageUpload">
+            <div if="!hasData() || isMultipleFiles" class="image image-placeholder" click="triggerImageUpload">
                 <div class="file-uploader-summary product-image-wrapper">
                     <div class="file-uploader-spinner image-uploader-spinner"></div>
                     <p class="image-placeholder-text" translate="'Browse to find or drag image here'"></p>