(cherry picked from commit af202acfd9e370b8746422286e59dbd124808674) Partly from rhel-8.4.0 (cherry picked from commit 8876ba917cb62d22c995e0bac73a2ced67ab03bc) Conflicts: firefox.spec
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/firefox#c8daf71be4963daab37d810024e0a6e7f04cf2dd