"Firefox Suggest" text appearing in UI

Steps to reproduce

In 12.0.4:

1. Open example.org in a tab.
2. Open a new tab, and start typing "example.org".

Result

Below the URL bar you will see "Firefox Suggest", as it suggests switching tabs. Also happens with bookmarks.

Expect

No appearance of "Firefox".

Origin

I think this comes from -firefox-suggest-brand-name used for urlbar-group-firefox-suggest. I guess "Firefox Suggest" is a product name since, whilst it includes just a local search of tabs and bookmarks, in the US it also includes

Top pick - Featured suggestions from Firefox and our partners

I'm guessing we have that last part disabled in Tor Browser, so we're not really using the "Firefox Suggest" part of the product. So maybe we'd be better off changing urlbar-group-firefox-suggest to our own string, rather than -firefox-suggest-brand-name itself.