Backport Mozilla's SVG-disabling patch

Mozilla partially uplifted our SVG disabling patch, but a lot of edge cases are left out that we need to add in order to use the uplifted patch.