- best possible (for now) backport of Mozilla M1487964 (7f48c9cd3) - upgrade ContentPolicy to InternalContentPolicyType and ExternalContentPolicyType (61759ab90)