Bug 883834 - Touch events position is wrong on desktop when a DOM element is scrollable
(cherry picked from commit f2e1981e5ac09b72e1e8ffcbc0f5f6c42cb92037)
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 #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)
Bug 890463 - Follow up of Use MMIResult for get IMEI - default case. r=etienne

(cherry picked from commit 5841c7d539f5d4d24f863a9ab3e23046dde96372)
Merge pull request #10943 from fabi1cazenave/mmsAttachmentContainers-bug889899

Bug 889899: use <div> instead of <iframe> for MMS attachment containers, r=julienw
(cherry picked from commit bd5dc592b4a6c3f46f1cbd2aca5d820414074320)
Bug 887712 - [SMS/MMS] Make editable cursor element "zero width" until any user interaction r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=887712

Includes: https://github.com/gnarf/gaia/commit/4880acb5ecf10b274dd8f6cf5e75b7d9ab5f8ab3

- Empty, out of focus placeholders contract to zero offset width
- Empty, in focus placeholders expand to rem-based width (margin: r & l, padding: r & l)
- When all recipients are deleted, don't leave empty editable in the to-field.
- When the editable placeholder is contracted to a zero offset width, it's possible to accidentally tap a recipient when the intention is to tap the to-field area around the recipient list, which will correctly prompt the user to remove the recipient. Since there is no way to unambiguously detect the user's intention, always handle "Remove" and "Cancel" in an intuitive way.

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit deeba30eb02ae1286ba277edb8f681c85bee1ca0)
Bug 889757 - [Dialer] When holding a call and selecting keypad, cannot hide keypad and input number

(cherry picked from commit a5d187e777e5692fc60be83bbf592637abbc8bc7)
Merge pull request #10771 from rwldrn/888150

Bug 888150 - [MMS][Regression] Header actions are not working properly.
(cherry picked from commit aaafec3c79e94041db7d22d3490f8d4916faeb3a)
Merge pull request #10945 from dominickuo/bug-889739

Bug 889739 - [gallery] Enable the done button after the picked image is. r=daleharvey
(cherry picked from commit 2132decefdb449962d8942b3791926a58104c642)
Merge pull request #10932 from brendandahl/pdfjs-v0.8.326

Bug 892721 - Update gaia pdf.js to version 0.8.326.
(cherry picked from commit 759f4b2608216299e00bdbdb5f110c61f6b9150d)
Merge pull request #10796 from ian-liu/clock/Bug890216_creating_alarm_button_is_not_align_with_date/day_context

Bug 890216 - [Clock] The button of creating alarm is not align with displaying date/day context, r=@rexboy7(cherry picked from commit 7c0e9b946b8779e1f48ce4e12fb149d326797fac)

Conflicts:

	apps/clock/style/onring.css
Bug 875271 - Remove alt camera button for v1-train. r=timdream