MAGETWO-69397: Hidden product images are not hidden from category listing or product view

 - support custom placeholder images

Author: cspruiell

app/code/Magento/Catalog/Helper/Image.php

@@ -6,7 +6,6 @@
 namespace Magento\Catalog\Helper;
 
 use Magento\Framework\App\Helper\AbstractHelper;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Catalog image helper
@@ -150,8 +149,9 @@ public function __construct(
         parent::__construct($context);
         $this->_assetRepo = $assetRepo;
         $this->viewConfig = $viewConfig;
-        $this->viewAssetPlaceholderFactory = $placeholderFactory ?:
-            ObjectManager::getInstance()->get(\Magento\Catalog\Model\View\Asset\PlaceholderFactory::class);
+        $this->viewAssetPlaceholderFactory = $placeholderFactory
+            ?: \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Catalog\Model\View\Asset\PlaceholderFactory::class);
     }
 
     /**