merge fx-team to mozilla-central
merge b2g-inbound to mozilla-central
Merge m-c to mozilla-inbound
Bug 995161 - Customize mode can still break after bootstrapped add-on with custom legacy:true toolbar restarts. r=Gijs.

--HG--
rename : browser/components/customizableui/test/browser_989609_bootstrapped_custom_toolbar.js => browser/components/customizableui/test/browser_bootstrapped_custom_toolbar.js
Bug 989683 - restrict how we inherit the menubar text color to tabsintitlebar cases on non-aero, r=dao
Backed out changeset 22feaebc0b2c (bug 821809) win8 debug jetpack-sdk test failures
Bug 991542, draw windows drop shadows from panels in content shells, r=tn
Bug 944392: Tracelogging: Fix incorrect numbering of files, r=bbouvier
Bug 944392: Tracelogging: Fix --enable-nspr-build builds, r=bbouvier
Bug 962676 - Reset expected assertion counts for Android crashtests; r=blassey
Bug 967704 - Update reftest manifests for Android 2.3; r=me
Bug 994101. Allow skia content on windows.

--HG--
extra : rebase_source : 7afdd908a24e7a9e4757af4dcb15f3dce792aa9c
Bug 990057 - Fix Promise exception in simulator. r=jryans
Bug 992948 - Add missing data to the telephony-call-ended systemmessage. r=hsinyi
Bumping manifests a=b2g-bump
Bumping gaia.json for 11 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/688b47681078
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17989 from guilherme-pg/findmydevice-lockscreen

Bug 992272 - Make the new Lockscreen Window Manager respond to 'lockscre...

========

https://hg.mozilla.org/integration/gaia-central/rev/aec1eacd1b2e
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 992272 - Make the new Lockscreen Window Manager respond to 'lockscreen.lock-immediately'.

========

https://hg.mozilla.org/integration/gaia-central/rev/eb7c4d1c9f2e
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #18103 from flodolo/bug991951_ftu

Bug 991951 - [B2G][FTU] Some external links on 'About Firefox OS' are not selectable

========

https://hg.mozilla.org/integration/gaia-central/rev/d0846d05ad24
Author: Francesco Lodolo (:flod) <flod@lodolo.net>
Desc: Bug 991951 - [B2G][FTU] Some external links on 'About Firefox OS' are not selectable

========

https://hg.mozilla.org/integration/gaia-central/rev/f938e246919f
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #18107 from Archaeopteryx/settings-bug986846-privacyPolicyWhitespaceTheXth

Bug 986846 - [settings] additional white space next to 'privacy policy' link in page about crash reports. r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/fcc2b89e9f68
Author: Sebastian Hengst <archaeopteryx@coole-files.de>
Desc: Bug 986846 - [settings] additional white space next to 'privacy policy' link in page about crash reports

========

https://hg.mozilla.org/integration/gaia-central/rev/004c4993f1f1
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16893 from chuck-lee/bug-907028_Wifi_Wake_Lock

Bug 979130 - Turn Wifi into power save mode while screen off with wifi lock held.

========

https://hg.mozilla.org/integration/gaia-central/rev/8959a8e88021
Author: Chuck Lee <chulee@mozilla.com>
Desc: Bug 979130 - Turn Wifi into power save mode while screen off with wifi lock held. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/c2a1b31f35ef
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 979833 - Spell out FDN r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/75672827dc78
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #18129 from Rik/fdn-message-979833

Bug 979833 - inconsistent presentation of message that number is not in ... r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/9d1c1d531581
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 979833 - inconsistent presentation of message that number is not in FDN list
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b4923337d01a
Author: dwi2 <dwi2@dwi2.com>
Desc: Merge pull request #18116 from dwi2/bug975293

Bug 975293 - Make sure we have _containerElement defined in the context ...

========

https://hg.mozilla.org/integration/gaia-central/rev/4ea68c15cd9f
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Bug 975293 - Make sure we have _containerElement defined in the context of _onTransitionEnd
Bumping manifests a=b2g-bump
Bug 990065 - Ship simulator screen xpcom in b2g desktop package and prevent it from breaking bfcache. r=vingtetun