fix conflict for logo_height argument by default.xml#30370

PierW wants to merge 3 commits intomagento:2.4-developmagento/magento2:2.4-developfrom

PierW:fix_logo_height_argument_xmlPierW/magento2:fix_logo_height_argument_xmlCopy head branch name to clipboard