Bug 1037864 - [GaiaGrid] Serve localization from within the gaia grid component r=crdlc
Bug 1043870 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/homescreen_navigation_test.js | Homescreen navigation > Going to the homescreen and back to a warm app
Merge pull request #21652 from KevinGrandon/bug_1037864_gaia_grid_localization

Bug 1037864 - [GaiaGrid] Serve localization from within the gaia grid component