Merge pull request #16464 from jrburke/bug974292-email-done-blank

Bug 974292 - [Email][V1.3&V1.4] Tapping the Done button of mail settings page redirects to a blank page r=asuth
Merge pull request #16251 from Moz-TedC/master

Bug 965346 - Part 2: Update airplane mode status whenever _enabled flag ...
(cherry picked from commit b30742e845f603441942ed295fa5359d9704b20a)
Revert "Merge pull request #16423 from nullaus/bug966027"

This reverts commit e631e7707a25af6310674f325131569cda61de6e, reversing
changes made to 34c45c7405ffd4846a49af4ba4927042008ef5e1.

Conflicts:
	apps/homescreen/everything.me/js/everything.me.js
Merge pull request #16253 from pmclanahan/send-language-to-basket-964342

Bug 964342: Send language setting to basket.
(cherry picked from commit ab77e4689a361752365ab94a966de6ac9fbc89bd)
Merge pull request #16372 from arcturus/bug-969293

[FTE] In FTE, when PIN is inserted, I can't see "Cellular data" screen instead i see "Select a network" screen
(cherry picked from commit bcb5d69cb805b9bde8643dc30f87848b6fda5298)
Merge pull request #16476 from jmcanterafonseca/fb_link_photos

Bug 974646 - [B2G][Contacts] Linking a Facebook contact to existing cont...
(cherry picked from commit 1c7fa06880e63164061ecc7427aa514ed19c9eb9)
Merge pull request #16522 from arcturus/bug-973661

Bug 973661 - [FTE] In FTE, when skipping PIN screen, there is no option to get that screen again when pressing back
(cherry picked from commit 8576b712fce2cce4a7be94b8e7ee4522f8057988)
Merge pull request #16492 from jaoo/963225

Bug 963225 - JavascriptException: TypeError: this._iccCard is null. r=kaze
(cherry picked from commit 41ddf8d12140f7310f037d65b1e8a04ba8cb7270)
Merge pull request #16299 from vingtetun/972245

Bug 972245 - Facebook photos can appear distorted in the call log. r=etienne(cherry picked from commit a921e33b583e87402fec2b369ecca737b880a90b)

Conflicts:

	apps/communications/dialer/js/call_log.js