Bug 866563 - [Buri][Homescreen]Continuously drag APP to hotseat,hotseat will be freeze
Delete languages_basecamp.json
Delete languages_shira.json
bug 896324 - Add Catalan to languages-dev.json.
Fix whitespace
Merge pull request #9819 from benfrancis/829400

Bug 829400 - Browser tabs close buttons are misplaced if the user touches the tab. r=daleharvey(cherry picked from commit 9374d2904a57a19b58ed67e0fc92ee80cb45659b)
Merge pull request #11133 from msujaws/patch-2

Bug 894232 - [Dialer] Disable 'Put call on hold' feature for Leo due to ... r=rik
(cherry picked from commit d6abf011ba3314f77fc687e73b842a46be6f3716)
Merge pull request #11135 from escapewindow/v1-train

bug 896324 - Add Catalan to languages-dev.json.
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 ...
Bug 898318 - The loading icon of video has wrong size in v1.1.0hd
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