[Backport] Fix the issue: Content overlaps the close button #19263#19340

magento-engcom-team merged 2 commits intomagento:2.2-developmagento/magento2:2.2-developfrom

gelanivishal:2.2-develop-PR-port-19264gelanivishal/magento2:2.2-develop-PR-port-19264Copy head branch name to clipboard