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

========

https://hg.mozilla.org/integration/gaia-2_0/rev/68a702692c4c
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #22178 from mikehenrty/bug-1036191-import-headers

Bug 1036191 - include font utils in import page
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/00aa750a9b35
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Revert "Merge pull request #21515 from weigao123/Bug980217-master"

This reverts commit 041c794bdce3a81767d1c60e776227f5c4d42651.

========

https://hg.mozilla.org/integration/gaia-2_0/rev/ec7a3886f1b2
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Revert "Bug 980217 - Remove extra line leftover from rebasing. a=bustage"

This reverts commit 6ccd97a605e7f4ccad2fa92ac9575b35028e07a7.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/6b99d558761f
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #22253 from viorelaioia/bug_1044019_v2.0

Bug 1044019 - Add /storage/sdcard to cleanup_storage in gaia test

========

https://hg.mozilla.org/integration/gaia-2_0/rev/d55ac36ec988
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1044019 - Add /storage/sdcard to cleanup_storage in gaia test
Bumping manifests a=b2g-bump
Merge mozilla-beta to b2g32. a=merge
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/5cda6bf1b324
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #22262 from mozmark/bug1030249-v2.0-retry

Bug 1030249 - Notify the server if Find My Device is disabled.

========

https://hg.mozilla.org/integration/gaia-2_0/rev/991ca451cf60
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1030249 - Notify the server if Find My Device is disabled.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/f4936c668cc4
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #22227 from davidflanagan/bug1041710-v2.0

Bug 1041710: ensure that wallpaper size always exactly matches screen si...

========

https://hg.mozilla.org/integration/gaia-2_0/rev/7be18f03a690
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1041710: ensure that wallpaper size always exactly matches screen size

when computing screen size for wallpaper pick activity use Math.ceil to get 854 instead of 853.5 for FWVGA

Unit tests for wallpaper_manager.js plus fix a broken bootstrap test

address review comments
(cherry picked from commit 7815e901b5ccec40b22987a10d002bb1225d8d17)

Conflicts:

	apps/settings/js/panels/display/wallpaper.js

remove special low-tolerance case for PNG image comparison in image_utils unit test because it caused failures on TBPL
Bumping manifests a=b2g-bump
Bug 1036264 - Always pass true for ignoreRootScrollFrame. r=kats, a=1.4+
Bug 1024148 - Part 1: Merge nsDisplayOpacity items together. r=mattwoodrow, a=2.0+
Bug 1024148 - Part 2: Merge nsDisplayOpacity into nsDisplayBackgroundColor. r=mattwoodrow, a=2.0+
Bug 1045421 - Disable test_crash_manager.js for failures on a CLOSED TREE r=me a=test-only
fix line endings, no bug, DONTBUILD
Bug 1016405 - Update the icons in the context menu to have the correct size, HiDPI, and inverted variants. r=mdeboer a=lmandel
Bug 988648 - Telemetry for Bookmarking/Saving r=liuche a=lmandel
Bug 1044255 - Fix 'storage.init is not a function' during startup r=margaret a=lmandel
Bug 1042884 - Do nothing in AudioStream::OpenCubeb() after shutdown. r=kinetik, a=sledru