Cherry-pick fixes for Mozilla bug 1758062

see: https://bugzilla.mozilla.org/show_bug.cgi?id=1758070