Merge inbound to m-c. a=merge
Merge fx-team to m-c. a=merge
Merge m-c to b2g-inbound.
backout 79bf6ebacb09 for causing 1070072
Bumping manifests a=b2g-bump
Bug 1069716 - Fix deficient CalcDifference of nsStyleList. r=heycam
Bug 1070076 - fixed createOffer options arg legacy-syntax-warning to not trip on absent arg. r=jesup
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b5f6c10e2583
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #24010 from wilsonpage/1066660

Bug 1066660 - [camera] Update drag for improved transitions

========

https://hg.mozilla.org/integration/gaia-central/rev/bb0487323a07
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1066660 - [camera] Update drag for improved transitions

========

https://hg.mozilla.org/integration/gaia-central/rev/dcdd1b716bcf
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #24193 from DouglasSherk/1069439-ice-contacts-broken

Bug 1069439 - Fix ICE contacts not showing up on emergency call screen. r=Rik

========

https://hg.mozilla.org/integration/gaia-central/rev/024360bfc8a9
Author: Doug Sherk <github@sherk.me>
Desc: Bug 1069439 - Fix ICE contacts not showing up on emergency call screen. r=Rik
Bumping manifests a=b2g-bump
Bug 1065130 - nsFtpState::mDoomCache is used uninitialised r=jduell
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/96f2947a5a91
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #24209 from rnowm/1069531

 Bug 1069531 - [Calendar] Settings: sync and gear icons overlaps r=millermedeiros

========

https://hg.mozilla.org/integration/gaia-central/rev/0ba56b8c1b99
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 1069531 - [Calendar] Settings: sync and gear icons overlaps
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/dd5811658293
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #24223 from daleharvey/1067573

Bug 1067573 - Add test to ensure default preloaded top sites show.

========

https://hg.mozilla.org/integration/gaia-central/rev/18411172c4ac
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1067573 - Add test to ensure default preloaded top sites show. r=kgrandon
Bumping manifests a=b2g-bump
Bug 1059202 - CSP and CA verfication for Trusted Hosted Apps r=fabrice,sicking,rlb
Bug 1059202 - Unit test - CSP and CA verfication for Trusted Hosted Apps r=sicking
Merge fx-team to m-c a=merge
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9ded69d21786
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #24197 from wilsonpage/1069200

Bug 1069200 - [Camera]Rapidly click take button and switch picture/video mode

========

https://hg.mozilla.org/integration/gaia-central/rev/034c50fd752c
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1069200 - [Camera]Rapidly click take button and switch picture/video mode will cause video recording and picture mode in the same time
Bumping manifests a=b2g-bump
Merge inbound to m-c a=merge