Merge pull request #25063 from julienw/1081684-load-default-theme-when-a-theme-is-requested

a=npotb
Bug 1081684 - [Build] Themes don't load when running in Firefox r=ricky
(cherry picked from commit 2543927ea3bfa7ec23d4e9241f62c157e6b128d1)