Merge pull request #7802 from etiennesegonzac/bug-833982-call-fail-silent

Bug 833982 - Better call error handling when no network(cherry picked from commit 5df0c698b0c3f386b02e670a15e100a5d59ec3cd)

Conflicts:
	apps/communications/dialer/js/telephony_helper.js
Bug 809076 - [UX VD] Drawer. Contact icon should not be there, is not a valid button
Merge remote-tracking branch 'arcturus/v1-train-833982' into v1-train
Merge pull request #7907 from etiennesegonzac/bug-836166-network-check

Bug 836166 - dialer - lazily checking the connection when the call button is pressed.(cherry picked from commit 05de5726720b1c98671cdcb983b7ee493b271e2b)
Merge remote-tracking branch 'albertopq/issue-8809076' into v1-train
Merge pull request #7952 from kanru/master

Bug 837839 - Add dogfood only prefs.js support and enable test only SUPL server. r=fabrice(cherry picked from commit 0f16ddb593aa6bdd881ed4d08e0a711fa35f29f0)
Merge pull request #8036 from asutherland/email-html-stop-bad-pre-tag

Bug 834734 - [EMAIL] HTML message display in newsletter mode may result in extremely wide iframes with bad aspect ratio for some messages. rs=squib(cherry picked from commit 2a4df8db0a32a064a9e2259efefc7b0058a7098a)
Merge pull request #8034 from jmcanterafonseca/fix_progress_fb_final

[Contacts UX] [Activity Indicator] Wrong use of spinner when connecting ...(cherry picked from commit 399cb80e93434830de009793f1c1d5c4d7a2272c)
Merge pull request #8004 from crdlc/bug-835710-v2

Bug 835710 - Homescreen not preventing BrowserElementScrolling code from...(cherry picked from commit 562921c3e76521f6073316634450571e2e35b11f)
Merge pull request #8039 from crdlc/bug-839561

Bug 839561 - weird animation: Moving the last icon of a panel to the doc...(cherry picked from commit 61f8ea5626f00054b7da00b23f3e18650279abdc)
Merge pull request #8060 from crdlc/bug-828851

[Bug 828851] Settings view should have a done button on the right instea...(cherry picked from commit a22bac2a4e4542a01654b9d3b7ae1bd50afd7199)
Merge pull request #8069 from asutherland/email-remove-default-sig

Bug 837269 - Remove "Sent from my Firefox OS" tag line from email app. r=squib(cherry picked from commit e598056383f6d3a24a16f927f19409aa60e43d02)
Bug 808576 - Revise layout of New Mail Account(cherry picked from commit 1968b88e4725bb3e638a7e49dd0c9caf8f3aa501)

Conflicts resolved by just taking the current state of the v1-train branch.

Conflicts:
	apps/email/locales/email.ar.properties
	apps/email/locales/email.fr.properties
	apps/email/locales/email.zh-TW.properties
Merge pull request #8074 from asutherland/email-revised-layout-v1

Bug 808576 - Revise layout of New Mail Account (cherry picked from commit  1968b88e4725bb3e638a7e49dd0c9caf8f3aa501) a=approval-gaiva-v1
Merge pull request #7625 from steveck-chung/email-bubble-display-fix

Bug 798292 - [Email] Recipient names should not show email address. r=asuth(cherry picked from commit b23c533788c83dcb26a20165c565b5c569dd9378)
Merge pull request #8075 from asutherland/email-bubble-display-fix-v1

Bug 798292 - [Email] Recipient names should not show email address. r=asuth (cherry picked from commit b23c533788c83dcb26a20165c565b5c569dd9378) a=approval-gaia-v1 for bug 798258
Merge pull request #7895 from steveck-chung/email-searchbar

Bug 798258 - [Email] [VD] Search field is wrong. r=asuth.(cherry picked from commit add0a54a3290107468a768ae5094a8400b0892c3)
Merge pull request #8076 from asutherland/email-searchbar-v1

Bug 798258 - [Email] [VD] Search field is wrong. r=asuth. (cherry picked from commit add0a54a3290107468a768ae5094a8400b0892c3) a=approval-gaia-v1
Bug 821683/Bug 820317 - [Email] Confirmation overlay didn't sync with building-block. r=asuth. (cherry picked from commit fd1dce6e1b56a21a11b7c801408ecb57da1591b3) a=approval-gaia-v1 on bug 821683.

Conflict was from https://bugzilla.mozilla.org/show_bug.cgi?id=811858 not being
present on v1-train.

Conflicts:
	apps/email/js/compose-cards.js
Merge pull request #8077 from asutherland/email-confirm-dialog-v1

Bug 821683/Bug 820317 - [Email] Confirmation overlay didn't sync with building-block. r=asuth. (cherry picked from commit fd1dce6e1b56a21a11b7c801408ecb57da1591b3) a=approval-gaia-v1 on bug 821683.