Merge pull request #8030 from rwldrn/839574

Bug 839574 - gaia HEAD stuck at "Based on Mozilla Technology" screen(cherry picked from commit 6d5a4949a1357296750cb15bf7f3374c78607004)

Conflicts:
	build/webapp-optimize.js
(cherry picked from commit 69dbcd84085f10bec0c0189b926ffb535b14dcfe)