Fix #1216 and the fallback theme#4756

Hanmac wants to merge 3 commits intoOpenMage:mainOpenMage/magento-lts:mainfrom

Hanmac:designLayoutUpdatesHanmac/magento-lts:designLayoutUpdatesCopy head branch name to clipboard