Bug 894388 - Fix errors during startup in B2G desktop
Merge pull request #11022 from comoyo/b2g_desktop_broken

Bug 894388 - Fix errors during startup in B2G desktop. r=salva