Merge pull request #14884 from flodolo/bug950171

Bug 950171 - [settings] "Improve Firefox OS" title displayed as "Improve {{brandShortName}}"
(cherry picked from commit b3baaadf40db67d8e5812de7a7bb0cdea26844b1)

(cherry picked from commit 1a5b5d779c5482124b4887cc40c7b853fcd4759a)