Bring over fix for bug 1973125 and 1978436#3997

MrAlex94 merged 1 commit intoBrowserWorks:currentBrowserWorks/waterfox:currentfrom

goodusername123:bug-1973125goodusername123/Waterfox:bug-1973125Copy head branch name to clipboard