Merge branch 'Issue-2382053' into 7.x-1.x
Issue #2380249 by eshta: Convert variation set preview into a separate view.
Merge branch 'Issue-2380249' into develop