No bug, Automated blocklist update from host bld-linux64-spot-344 - a=blocklist-update
No bug, Automated HSTS preload list update from host bld-linux64-spot-420 - a=hsts-update
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_4/rev/7ab87934eae6
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #18602 from jimporter/music-update-hidden-scrubber

Bug 1000214 - [music] Update progress bar when display is suspended and ...
Conflicts:
	apps/music/test/marionette/Player_test.js
Bumping manifests a=b2g-bump
Bug 968419 - Store and submit a persistent health report identifier. r=rnewman, r=bsmedberg, a=lsblakk

Up to this point, Firefox Health Report has generated and submitted a
random UUID with each upload. Generated UUIDs were stored on the client.
During upload, the client asked the server to delete all old UUIDs.
Well-behaving clients thus left at most one record/ID on the server.

Unfortunately, clients in the wild have not been behaving properly. We
are seeing multiple documents on the server that appear to come from the
same client. Clients are uploading new records but failing to delete the
old ones. These old, undeleted "orphan" records are severely impacting
the ability to derive useful knowledge from FHR data because it is
difficult, resource intensive, and error prone to filter the records on
the server. This is undermining the ability for FHR data to be put to
good use.

This patch introduces a persistent client identifier. When the client is
initialized, it generates a random UUID. That UUID is persisted to the
profile and sent as part of every upload.

For privacy reasons, if a client opts out of data submission, the client
ID will be reset as soon as all remote data has been deleted.

We still issue and send upload IDs. They exist mostly for forensics
purposes so we may log client behavior and more accurately determine
what exactly misbehaving, orphan-producing clients are doing.

It is worth noting that this persistent client identifier will not solve
all problems of branching and orphaned records. For example, profile
copying will result in multiple clients sharing a client identifier. A
"client ID version" field has been added to facilitate an upgrade path
towards client IDs with different generation semantics.
Bug 988410 - Move directory service calls onto MainThread. r=bent, a=lsblakk
Bug 999080 - Preprocess extensions.css. r=jaws, a=gavin
Bumping manifests a=b2g-bump
Bug 992512 - DOMStorageCache crashes (sDatabase access violation read), r=smaug, a=lsblakk
Bug 1001134 - Gamepad service leaks windows if a page goes into bfcache. r=ted, r=continuation, a=lsblakk
Bug 996536 - Don't assume that all interpretedLazy functions have a lazyScript. r=bhackett, a=lsblakk
Bug 1000858 - Fix r_gettimeint on win32 which prevented us from sending TURN allocations. r=ekr, a=lsblakk
Bug 969392 - Remove the check for 'canplaythrough' in 'ended' event handler. r=kinetik, a=test-only
Bug 843265 - Remove the check for 'canplaythrough' since the purpose of this test is test the 3 ways to register an event handler. r=kinetik, a=test-only
Bug 942121 - Fix WebIDL dictionary member tracing to null-check nullable object types before trying to trace them, since passing pointer-to-null to JS_CallObjectTracer is not OK. r=smaug, a=lsblakk
Bug 986166 - Disable browser_dbg_variables-view-edit-click.js on Windows and OSX opt for frequent failures. r=vp, a=test-only
Bug 963244 - Disable test_dataChannel_basicAudio.html on B2G emulator builds for being nearly perma-fail. a=test-only
bug 998539 - b2g30 in-tree fixes. r=hwine
merge aurora->b2g30. a=mergeday