Fix problem while rendering product variant images

Merged Santiago Said requested to merge FixProblemWhileRenderingProductVariantImages into 11.0-stage

Merge request reports