Bug 869346 - [System] [Video] [Bluetooth] String message is half-hidden when Share->Bluetooth is selected on a video.
Bug 865999 - After landing import from vCard Contact Settings screen is visually broken [r=arcturus,jhford]

Merged https://github.com/mozilla-b2g/gaia/commit/6f7897135f4cc70fb21eb3c737df4249a29c673b
Merge pull request #9811 from ian-liu/v1_train/bluetooth/string_message_of_turn_on_bt_dialog_truncated_in_landscape_mode

Bug 869346 - [System] [Video] [Bluetooth] String message is half-hidden when Share->Bluetooth is selected on a video. r=@alivedise
Merge pull request #9198 from pivanov/bug-808250

Bug 808250 - In Display settings, the icons for brightness slider seem flipped to people (followup) r=samjoch

(cherry picked from commit b65dbaace1bfc940db6f10aee6ad3c54187d25aa)

Conflicts:
	apps/settings/style/images/range_icons_brightness_min@2x.png
Merge pull request #9764 from fcampo/ussd-l10n

Bug 863297 - PIN related labels are not correctly localized: mmi update (r=etienne)(cherry picked from commit d510063ad9ea78cfa47fb27c85246b1c0cf85c44)
Merge pull request #7991 from daleharvey/handle-camera-errors

Bug 838639 - Add an error handler when we fail to take a picture(cherry picked from commit 04a78898293bfb943f103874040b587a1026ff19)
Bug 866036 - [Buri][Audio]Can't adjust game volume. (Poppit) r=alive
(cherry picked from commit 7c87f0b247f04996c7173a22be249f9304e2ad9c)
Merge pull request #9853 from davidflanagan/bug838639-v1-train

Merge pull request #7991 from daleharvey/handle-camera-errors
Merge pull request #9818 from gtorodelvalle/dialer-bug-872054-busy-tone-on-speaker

Bug 872054 - [Inari] Busy line tone is heard through the speaker (r=etiennesegonzac)(cherry picked from commit 57568a25435d46c50015c2005eb13171e92dd21b)
Bug 866481 - Properly handling emergency calls coming from the
lockscreen.
r=arcturus
(cherry picked from commit 2b8914b3c70f5c12b9ec42c58d2fcb3bb0e1e8a9)
Merge pull request #9794 from arcturus/bug-872512

Bug 872512 - [CONTACTS][FTU] Use the new OAuth redirection mechanism to log in services like Facebook, Gmail or Outlook(cherry picked from commit 0478fc101cc6ba6bc828dcc708daeb7742d9fbda)
Merge pull request #9754 from mpizza/fixd_typo_ceWarningcontent

Bug 871681 - [system] typo in ceWarningcontent: 'hight' instead of 'high', r=alive, pike(cherry picked from commit adf7fedc37ddef00b6ce1e2eb7bd3855c80856f4)
Merge pull request #9757 from deadsquid/google

Bug 811824 - Change default search to Google r=benfrancis(cherry picked from commit 8793aee46cfba6a506bc0f8f26f483183329fd62)
Merge pull request #9717 from leob2g/bug_871472_camera_wakelock_regression

 Bug 871472 - [Camera] unlocking the wakelock without proper testing cre... r=daleharvey(cherry picked from commit c70775cb8ed6e46fe4afb512f2c27c7d39bbf6be)
Merge pull request #9787 from comoyo/vcard_qp

Bug 871909 - Importing contacts from sd card has problem with accented names [r=arcturus](cherry picked from commit 758e3f03da31695a37ce5d5beddf3d4ae0e9f0c5)
Merge pull request #9437 from mikehenrty/bug-853125

bug 853125 - only populate default alarm when first creating event(cherry picked from commit a7690eb906ccab88fb806ca9ba3ef67b97331154)
Merge pull request #9805 from asutherland/email-compose-input-focus-helper

Bug 871901 - [Buri][E-mail] It is not possible to go to "end of line" after correct some characters of e-mail address. r=squib, a=blocking-b2g=tef+(cherry picked from commit a69e90db36e091fdbaaf692bd983816d3897dcaa)
Merge pull request #9751 from lissyx/bug863165.master

Bug 863165 - Adding localisation for date/time selectors r=kgrandon(cherry picked from commit bbd6e46084370f3aee54231695880bb702299710)
Merge pull request #9796 from fabi1cazenave/headphonesHangUp-bug853132

 Bug 853132 - Phone hangs up when headphones are plugged in, r=etienne(cherry picked from commit 6f1813f04d07726325691071b4981554c4f02a9d)
Merge pull request #9841 from etiennesegonzac/bug-860603-attentionscreen-overzealous-hide

Bug 860603 - Don't hide the attention screen when the displayed app crashes (and makes the homescreen appear).
r=vingtetun(cherry picked from commit af15e30051af05a150d85fbe29e5fa9b6bbc2570)