Merge remote-tracking branch 'mainline/develop' into MAGETWO-87081-video

# Conflicts:
#	app/code/Magento/PageBuilder/view/adminhtml/requirejs-config.js
#	app/code/Magento/PageBuilder/view/frontend/web/js/default.js

Author: irenelagno

app/code/Magento/PageBuilder/view/frontend/layout/default.xml

@@ -50,7 +50,7 @@
                                 <item name="component" xsi:type="string">Magento_PageBuilder/js/widget/show-on-hover</item>
                                 <item name="config" xsi:type="array">
                                     <item name="buttonSelector" xsi:type="string">.pagebuilder-banner-button</item>
-                                    <item name="showOverlay" xsi:type="string">on_hover</item>
+                                    <item name="showOverlay" xsi:type="string">hover</item>
                                     <item name="dataRole" xsi:type="string">banner</item>
                                 </item>
                             </item>

app/code/Magento/PageBuilder/view/frontend/web/js/content-type/map/appearance/default/widget.js

@@ -11,24 +11,24 @@ define([
     return function (config, element) {
         var locations,
             controls,
-            mapOptions = {},
-            $element = $(element);
+            mapOptions = {};
 
-        /**
-         * Sets height to 300px as default if no height input. But will not be saved to database
-         */
-        if ($element.context.style.height === '') {
-            $element.height('300px');
-        }
+        if (element.hasAttribute('data-locations')) {
+
+            /**
+             * Set map display to none if no locations
+             */
+            if (element.getAttribute('data-locations') === '[]') {
+                $(element).hide();
 
-        if (element.hasAttribute('data-locations') && element.getAttribute('data-locations') !== '[]') {
+                return;
+            }
             locations = JSON.parse(element.getAttribute('data-locations'));
             locations.forEach(function (location) {
                 location.position.latitude = parseFloat(location.position.latitude);
                 location.position.longitude = parseFloat(location.position.longitude);
             });
             controls = element.getAttribute('data-show-controls');
-            mapOptions.center = locations[0].position;
             mapOptions.disableDefaultUI = controls !== 'true';
             mapOptions.mapTypeControl = controls === 'true';
             new GoogleMap(element, locations, mapOptions);

dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/map/appearance/default/widget.test.js

@@ -23,13 +23,6 @@ define([
     });
 
     describe('Magento_PageBuilder/js/content-type/map/appearance/default/widget', function () {
-        it('Sets element height to 300px if no height is set', function () {
-            var el = document.createElement('div');
-
-            mapWidgetInitializer(undefined, el);
-
-            expect(el.style.height).toBe('300px');
-        });
 
         it('Does not call googleMap constructor if element is missing data-locations', function () {
             var el = document.createElement('div');
@@ -52,10 +45,6 @@ define([
                 el,
                 JSON.parse(locationsJSON),
                 {
-                    center: {
-                        latitude: 0,
-                        longitude: 0
-                    },
                     disableDefaultUI: false,
                     mapTypeControl: true
                 }