Bug 960579 - [v1.3] Unxfail test_settings_change_keyboard_language.py fail
Bug 948386 - [1.3][MMS] Multi-recipient. It appears the attach icon in the recipients' detail view r=schung
Bug 949358 - Orientation management for callscreen + lockscreen + active app

Conflicts:
	apps/system/js/orientation_manager.js
	apps/system/test/unit/orientation_manager_test.js
Merge pull request #15754 from alivedise/bugzilla/949358_v1.3/callscreen-orientation

Bug 949358 - Orientation management for callscreen + lockscreen + active...r=timdream, a=1.3+
Merge pull request #15648 from etiennesegonzac/bug-907112-lockscreen-too-easy-unlock

Bug 907112 - Prevent the phone from unlocking in my pants r=alive
(cherry picked from commit 2946ccc07ec28cea44994d98598b85db301edd12)

a=fabrice
Bug 964215 - [Everything.me] Labels in Collection suggestions list do not match ones created on Homescreen [r=ranbena]
Bug 960756 - Remove tab indentation

GJsLint doesn't like it!
Merge pull request #15772 from dwilsoncaf/bug-960756-delint

Bug 960756 - Remove tab indentation
r=julien
Merge pull request #15747 from julienw/948386-v1.3-hide-attachment-icon

Bug 948386 - [1.3][MMS] Multi-recipient. It appears the attach icon in t...
Revert "Merge pull request #14653 from fcampo/mms-forward-subject-941030"

This reverts commit cb6280606e1a306b13bb48e45fb3fcd940ff9f71.
Merge pull request #14653 from fcampo/mms-forward-subject-941030

Bug 941030 - [Messages] Follow up Bug 919966 - Ensure that forwarding a MMS with a subject fills in the subject in the composer
(cherry picked from commit 4df4a5b17839fc6ce748029fc1e79bb2bde3cc87)

Conflicts:
	apps/sms/js/compose.js
	apps/sms/js/message_manager.js
	apps/sms/test/unit/compose_test.js
	apps/sms/test/unit/mock_compose.js
        apps/sms/test/unit/message_manager_test.js
Merge pull request #15777 from julienw/941030-v1.3-subject-forwarding

Bug 941030 - Merge pull request #14653 from fcampo/mms-forward-subject-941030
r=rwaldron
bug 963322

* uri decode the message before setting it as text content.
* this is only required for 1.3 as 1.4 and greater uses the URL object which automatically does this for us.

r=mhenretty
Bug 958412 - [Gaia][DSDS] move simcard detection logic to system app

- add sim_settings_helper
- add related test
- update slot.isAbsent()
Merge pull request #15709 from EragonJ/v1.3-bug-958412

Bug 958412 - [Gaia][DSDS] move simcard detection logic to system app
Merge pull request #14468 from Rik/contact-in-dialer-fake-943779

Bug 943779 - Need to update the images displayed while the contact tab i... r=etienne
(cherry picked from commit 7252dc37bcf7ff907af9c41720dd8891f935b4dd)
Bug 922391 - [B2g] [E.me] UI overlaps when user tries to delete an app from the dock area

(cherry picked from commit 7d77f85affb9d7c26bb5c03ba615c8a054eba50a)
Merge pull request #15555 from gitmai/bug-961742-CC-VIVO-cfg-not-detect-only-one-decimal

Bug 961742 -[Cost Control] Check balance with Brazil VIVO prepaid SIM ca..
r=salva
(cherry picked from commit 75ea7d07cdb590722634016410e12819faf82e5a)
Merge pull request #15549 from jaoo/959986

Bug 959986 - [DSDS] When one SIM is active, still user can access Call Settings of another SIM card. r=arthurcc
(cherry picked from commit 3cec0bce6716cb9ef6b80e9eedaca4936948a18b)
Merge pull request #15411 from gitmai/bug-928620-CC-set-reset-report-works-abnormal

Bug 928620 - [Buri][Data usage]Set the phone and internet data report is...
r=salva
(cherry picked from commit c4fd0e7f2106af0d57f385ea3a7753c331850555)