Merge m-c to b2g-inbound.
Backed out changeset bb5701078d13 (bug 961238) for likely troboprovider bustage.
Merge m-c to b2g-inbound.
Bug 966804 - Disable webspeech/recognition/test/test_timeout.html on Windows due to frequent failures.
Bug 959066 - Hi-res screenshot for getScreenshot API. r=smaug
Bug 959066 - Test for hi-res screenshot for getScreenshot API. r=smaug
Bug 966244 - Alarms are not updated after clearStats. r=gene, r=jshih
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5d00248220fd
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 964918 - Fix timing in Python test_kill_multiple r=me a=testonly

========

https://hg.mozilla.org/integration/gaia-central/rev/a8d960b37f12
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #16092 from hfiguiere/bug962040-2

Bug 962040 - blacklist camera until we figure out why it hangs. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/4a8dd3152582
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 962040 - blacklist camera until we figure out why it hangs.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/3b9daa8b2380
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #14991 from zacc/bug_955626

Bug 955626 - Change wait in GaiaTest class to wait for AppWindowManager ...

========

https://hg.mozilla.org/integration/gaia-central/rev/7a55339a30a5
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 955626 - Change start_b2g wait in GaiaTest to wait for AppWindowManager to acknowledge the active frame instead of js event
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/4374625d5097
Author: Jan Keromnes <janx@linux.com>
Desc: Merge pull request #16091 from jankeromnes/developerhud

Bug 968220 - Add a "Developer HUD" sub-menu in "Developer". r=vingtetun

Note that this also deletes the Grid overlay.

========

https://hg.mozilla.org/integration/gaia-central/rev/7caaa1965467
Author: Jan Keromnes <janx@linux.com>
Desc: Bug 968220 - Add a "Developer HUD" sub-menu in "Developer". r=vingtetun
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e4e5c2c5cdc9
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #16212 from gnaneswar/Issue_960705

Bug 960705 - [clock][l10n] Close button should say Stop instead; r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/0b32d272019c
Author: Gnaneswar Devuni <gnaneswar.devuni@accenture.com>
Desc: Bug 960705 - [clock][l10n] Close button should say Stop instead; r=reviews
Bumping manifests a=b2g-bump
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/1abfd8e7a805
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #16149 from davidflanagan/bug963917-3

Bug 963917: reduce Gallery memory use (and fix leak) while scanning r=dkuo

========

https://hg.mozilla.org/integration/gaia-central/rev/e2e30ae8edcb
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 963917: reduce Gallery memory use (and fix leak) while scanning

force software canvases for thumbnail and preview creation with willReadFrequently

Free canvas memory after creating a thumbnail

Make sure our thumbnail blobs are file-backed not memory-backed

update mediadb docs
(cherry picked from commit 4b5eaa4a2823d8961b80a3b975b1eeed92b9fcb7)

Conflicts:

	apps/gallery/js/MetadataParser.js
	apps/gallery/js/gallery.js

========

https://hg.mozilla.org/integration/gaia-central/rev/e29948e74a5c
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #16186 from mcav/bold-date

Bug 930563 - [B2G][L10n][Clock] Chinese Traditional: Highlight date. r=gnaneswar

========

https://hg.mozilla.org/integration/gaia-central/rev/1cabb0ea97ae
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 930563 - [B2G][L10n][Clock] Chinese Traditional: Highlight date instead of first number displayed.
Bumping manifests a=b2g-bump
Merge m-c to b2g-inbound.
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5143c5edf9df
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 966215 - Allow make test-integration to specify TEST_FILES. r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/ed9bb3f662e9
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Merge pull request #16097 from qdot/969587-variant-with-no-icc

Bug 969587 - Run variant customization with no icc

========

https://hg.mozilla.org/integration/gaia-central/rev/7a8134fdef11
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 969587 - Integration tests for FTU variant customization

========

https://hg.mozilla.org/integration/gaia-central/rev/acc8e5f9225e
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 969587 - Make customization run without ICCHelper present
Bumping manifests a=b2g-bump