Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/798be87c6457
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #22314 from KevinGrandon/bug_1046158_homescreen_settings_cleanup

Bug 1046158 - [Settings] Revert logic for column display detection
Conflicts:
	apps/settings/elements/homescreen.html

========

https://hg.mozilla.org/integration/gaia-2_0/rev/3e8462d22c90
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #22313 from KevinGrandon/bug_1046158_homescreen_columns

Bug 1046158 - [Vertical Homescreens] Use three columns by default everywhere

========

https://hg.mozilla.org/integration/gaia-2_0/rev/f1588d69cb56
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1044316 - Dont assume uppercase .nodeName. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-2_0/rev/05dbc4b59f32
Author: Fernando Campo <fcampo@users.noreply.github.com>
Desc: Merge pull request #22438 from fcampo/fte-time-choose-1042388

Bug 1042388 - [FTU] Changes to Region/City selectors are not displayed onscreen (r=francisco)
Conflicts:
	apps/ftu/js/app.js
Bumping manifests a=b2g-bump