Bug 892357 - Followup to bug 890454 - [Homescreen] The save-bookmark screen does not work fine when Add to Home Screen button is pressed continuously
Merge pull request #10835 from cctuan/890847

Bug 890847 - [SMS/MMS] The options shown in the dialog when tapping on a contact into ‘To’ field are the wrong way round
(cherry picked from commit d0c9d97070ee6e46a2396e598b1123f0f7ac58c4)
Merge pull request #10726 from julienw/885278-updatetimeheaders-with-fixedheader

885278 updatetimeheaders with fixedheader
(cherry picked from commit c1de1e8c0a25f960a44dab94ad683c4e42ccec34)
Merge pull request #10901 from comoyo/vcf4

Bug 888153 - [contacts] Import from vCard 4.0 has email missing in Contacts app
(cherry picked from commit fd0d621e8c1cfbc9afc9af317edb8bb03dc77ed5)
Bug 890291 - [MMI] Follow-up of Localization of Call Barring functionality. r=etienne

(cherry picked from commit 4f9eff4725930288a205146272db822e2e5d2cff)
Merge pull request #10905 from huchengtw-moz/video/Bug_889191_using_videojs_for_playing_bluetooth_files

Bug 889191 - [Video] video player shows spinner for the few events when. r=daleharvey
(cherry picked from commit 147cd38ed0ceda9860ac8b72645e8c9f3ccae149)
Merge pull request #10898 from arcturus/bug-890206

Bug 890206 - [SMS] Messages dissapear from the thread when trying to re-send a failed message
(cherry picked from commit 36be864d7ed7050043e049dff30883a0ae465d6f)
Bug 891811 - [sms] tests: properly use sinon so that we have no side effects between suites r=gnarf

properly use sinon sandboxes for good restore

(cherry picked from commit da54242450d84f68ad10ffe73e14c4bfdcec3d3e)
Merge pull request #10899 from julienw/891927-fixes-sinon-implementation

Bug 891927 - [test-agent] the sinon sandbox is not always restored when ...
(cherry picked from commit 4939401e30ecda3ad81ba174765d48e543420453)
Merge pull request #10875 from mcirlanaru/bug_853313

Bug 853313 - [Email] Properly parse 'mailto' links that don't... r=@asutherland(cherry picked from commit 4be813b65ea30e3914ce732d1401385d8fb78b68)

Conflicts:

	apps/email/js/query_uri.js
Merge pull request #10953 from mcirlanaru/v1-train_bug_853313

Merge pull request #10875 from mcirlanaru/bug_853313
Merge pull request #10915 from dominickuo/bug-882683

Bug 882683 - [music] check trak atom to filter iso base media files, r=mozsquib(cherry picked from commit 49349122b9f2fb7f3e8b04d46fc221d0168d6f4b)
Bug 891170 - [leo][System][calendar] In the date picker of the calendar app, the text in the Month field overlaps with the day
Merge pull request #10946 from cctuan/v1-891170-2

Bug 891170 - [leo][System][calendar] In the date picker of the calendar app, the text in the Month field overlaps with the day
Merge pull request #10936 from crdlc/bug-892357-v1-train

Bug 892357 - Followup to bug 890454 - [Homescreen] The save-bookmark scr...
Bug 892480 - [SMS] Sending two phone numbers separed by space or enter should detect two phone numbers - r=arcturus

* Shorten the greediness of the match to not accept as many numbers
* Added a check to ensure that the character after the match is not a digit
* Only allow space and tab as separators in phone numbers
(cherry picked from commit 70de7c7971bbb2bdc4bd9e7ddc3f0ae3a40a9f9f)
Bug 891908 - [MMS] Replacing an attachment with a large image should trigger resizing - r=schung

* Ensure that image resizing is triggered whenever an image is added (even via replace)
(cherry picked from commit 50cbc05a8b56b39aad00b677a6c3bd5a2e900b1f)
Merge pull request #10827 from steveck-chung/hdpi-image-assets-css

Bug 884975 - [MMS] Apply 1.5x Res Version of the Images. r=julienw
(cherry picked from commit 566dc43df6ebb19669471557093e12c26ccb932c)
Merge pull request #9997 from evanxd/bug-876081

Bug 876081 - [Contacts] The labels show wrongly in edit page.
(cherry picked from commit dd4d39651c25bc6e8e3a74456c7815df2067044c)
Merge pull request #10630 from leob2g/bug_887133_icons_orientation_alignment

bug 887133 making flash and toggle camera icons to align with phone's orientation. r=daleharvey
(cherry picked from commit ae9a2882ef50ffc19112b52044e698a364fdbf8f)