HOTFIX: Product-Specific Layout Theme Setting Fix

Use Product-specific layout theme setting for Use Matrix Variant Display
instead of always using the Theme default.