Bug 996479 - {{browserBrandShortName}} is displayed instead of Firefox OS (browser, FTU)
Merge pull request #20913 from yurenju/branding

Bug 996479 - {{browserBrandShortName}} is displayed instead of Firefox O... r=@cctuan