Merge remote-tracking branch 'mainline/2.1-develop' into bugfixes_2.1.4

Author: Olexandr Lysenko

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php

@@ -567,12 +567,19 @@ public function clickBaseImage()
      */
     public function closeFullImage()
     {
-        $element = $this->browser->find($this->fullImageClose, Locator::SELECTOR_CSS);
-        if (!$element->isVisible()) {
-            $element->hover();
-            $this->waitForElementVisible($this->fullImageClose);
-        }
-        $element->click();
+        $this->_rootElement->waitUntil(
+            function () {
+                $this->browser->find($this->fullImage)->hover();
+
+                if ($this->browser->find($this->fullImageClose)->isVisible()) {
+                    $this->browser->find($this->fullImageClose)->click();
+
+                    return true;
+                }
+
+                return null;
+            }
+        );
     }
 
     /**