MAGETWO-65480: [Backport] - [Performance] Image metadata caching - for 2.1.6

Author: zakdma

app/code/Magento/Catalog/Block/Product/ImageBlockBuilder.php

@@ -150,8 +150,8 @@ public function buildBlock($product, $displayArea)
                 'height' => $height,
                 'label' => $label,
                 'ratio' => ($width && $height) ? $height / $width : 1,
-                'resized_image_width' => $resizedInfo['width'],
-                'resized_image_height' => $resizedInfo['height'],
+                'resized_image_width' => empty($resizedInfo['width']) ? $width : $resizedInfo['width'],
+                'resized_image_height' => empty($resizedInfo['height']) ? $width : $resizedInfo['height'],
             ],
         ];