Bug 866563 - [Buri][Homescreen]Continuously drag APP to hotseat,hotseat will be freeze
Bug 863418 - [email] v1-train "No mail in this folder" display has tiny text due to bad v1-train uplift. r=asuth, a=blocking-b2g=leo+

This is a manually checked/assisted uplift of:
Bug 845071 - Email Search - No Matches Screen Update
(cherry picked from commit 4b488e8a61d7fe27874fa0e5e05cea7a86cdd058)

The uplift was not previously made because of confusion because of a bad uplift.
Merge pull request #11153 from asutherland/email-search-screen-fix

Bug 863418 - [email] v1-train "No mail in this folder" display has tiny text due to bad v1-train uplift. r=asuth, a=blocking-b2g=leo+
Bug 897977 - Fixing FTE for v1-train only
Merge pull request #11029 from daleharvey/892852

Bug 892852 - Use a lower resolution for recording during pick. r=djf
(cherry picked from commit 41418e090907d7278c772412be5ae6bf91d09952)
Merge pull request #11124 from fcampo/2error-sendingSms

Bug 891855 - [sms][mms] Gaia should handle the error codes properly to pop up reasonable prompt
(cherry picked from commit 5aac3408cdefed4afb1b14d57a69d713c69b46b9)
Merge pull request #10890 from EverythingMe/890437

[Bug 890437] E.me swipe keyboard hide [r=Evyatron]
(cherry picked from commit 4afffd7122219fb99531e9e9a971299a2f16d72e)
Merge pull request #10859 from leob2g/Bug_891299_String_disappear

Bug 891299 - [Dialer] String disapper when using keypad and hide
(cherry picked from commit faf51f36abcec0a349ff44ab7a7de10fe0010314)
Bug 896755: Handle app crashes in the cost control widget. r=salva

This still makes no effort to handle non-fatal 'mozbrowsererror's.

(cherry picked from commit 8b49be437ee81aa76ac8e267afeb7d25520068fc)
Merge pull request #11073 from crdlc/bug-866563-v2

Bug 866563 - [Buri][Homescreen]Continuously drag APP to hotseat,hotseat ...
Revert "Merge pull request #11009 from mozshiao9/v1-train_settings_889717"

This reverts commit 7ee822b8ad62cef335c60bda489887353fcd0806, reversing
changes made to 0ce3196d563b07b257850de2583b83f219a98a83.
Merge pull request #10685 from daleharvey/885349

Bug 885349 - Check for hasVideo flag on context menu and treat as audio if false. r=benfrancis
Merge pull request #11166 from lodr/bug-897977-fixing-fte

Bug 897977 Fixing FTE
r=arcturus
label desktop-helper as fx-compatible and set recommended maxVersion; r=vingtetun, a=NPOTB

(cherry picked from commit 7315f49c817f56b57ab453bf184f0587cdd1795e)
Merge pull request #11190 from mykmelez/v1-train-fx-version

bug 898130 - label desktop-helper as fx-compatible and set recommended maxVersion; r=vingtetun, a=NPOTB
Merge pull request #11048 from comoyo/vcf-encoding

Bug 883278 - [contacts] importing from .vcf file (sd card) puts providedfirstname and lastname in firstname field if both contain only ascii characters, causes sort by lastname to fail [r=arcturus]
(cherry picked from commit bbad03e30527e1df8261a462e5cefbdc562f0819)

Conflicts:
	apps/communications/contacts/js/utilities/vcard_parser.js
Bug 899328 - Register only one listener for mozbrowserloadend and appopen on a given app iframe.

This prevents us from leaking listeners.
Bug 858463 - Hide the subtitle Accounts if there is no account in settings (cherry picked from commit c542dd1)
Merge pull request #11238 from jlebar/apploaded-listener-b2g18

Bug 899328 - Register only one listener for mozbrowserloadend and appopen (v1-train PR)
Merge pull request #9868 from RudyLu/keyboard/catalan_support

Bug 866746 - Catalan keyboard layout r=RudyLu(cherry picked from commit 1419f08968e1a4b746579af39c9e2dbb44c0cf9d)

Conflicts:

	apps/settings/index.html
	shared/resources/keyboard_layouts.json

Merge pull request #9888 from gaye/bug-866746-followup

Bug 866746 - Fix lint errors introduced by 1419f0 r=RudyLu(cherry picked from commit 26701c886c262a40ffb9bcca3121204575baa922)

Conflicts:

	apps/keyboard/js/render.js

remove unused layout property