Bug 883834 - Touch events position is wrong on desktop when a DOM element is scrollable
(cherry picked from commit f2e1981e5ac09b72e1e8ffcbc0f5f6c42cb92037)
Merge pull request #10686 from Rik/notifications-883829

Bug 883829 - When the handset receives a notification in Portuguese, the relative time is cut r=alive
(cherry picked from commit f05656aefc7c942e0b5dfce6de175c2e1b7742cf)
Merge pull request #10620 from davidflanagan/bug874011

Bug 874011: change auto-correct language and suggestions when user switches keyboards r=mcirlanaru(cherry picked from commit e9027411eb0863e15f1f81fa6f74cc1a043fe85c)

Conflicts:

	apps/keyboard/js/layout.js
Merge pull request #10746 from davidflanagan/bug874011-v1-train

Merge pull request #10620 from davidflanagan/bug874011
Bug 870711 - Fixes URL linking in SMS - r=julienw

* Rewrote LinkHelper to avoid a bunch of edge cases and overlapping links
* Modeled greatly after `android.text.util.Linkify`
* Co-Author credit for @lissyx for starting me out with an awesome unit test suite

Closes gh-10741
(cherry picked from commit a310b24b731d5a3c1779e65f112dc5ee88758ddc)
Merge pull request #10289 from rnowm/disabled-switches

Bug 880567 - [Settings] Airplane mode and geolocation toggles are translucent always(cherry picked from commit 49d7cee07f3d8d18e28ef931271d5d23278216d5)
Bug 884489 - [i10n] Add support for localizing style- and dataset- DOM properties r=kaze
(cherry picked from commit d6ac9e01cb756c6678f519397866d98d1b4e0ac6)
Merge pull request #10500 from dominickuo/bug-884722

Bug 884722 - [music] support amr for open activity, r=timdream(cherry picked from commit 1b6752d91ee604fe62bb42c2c03c80724b920b98)
Merge pull request #10744 from lodr/bug-888206-avoiding-crash-during-startup

Bug 888206 - Avoiding crash during startup
r=arcturus(cherry picked from commit 77db0e56e2f14fcd007321392b20150581f6c5ae)
Merge branch 'v1.1.0hd' into v1-train
Bug 888184 - Remove the canvas-based animations introduced in the workaround for bug 822345

- Removed the JavaScript code used to create the animations
- Removed the unused PNG files
Merge pull request #9463 from lightsofapollo/test-agent-node-v0.10

vbump test-agent(cherry picked from commit b7b54d4696ba8043ac0615e813581ba6435551d0)

Conflicts:

	tools/test-agent/package.json
(cherry picked from commit 76d4afd16fcd555665b91dc312fed735209f2ec3)
Revert "Merge branch 'v1.1.0hd' into v1-train"

This reverts commit aa25846b5cebcde99d64de615227e83f655c9abb, reversing
changes made to 11df918f3c852e6acf8012ba80f363a64d854e41.
Merge pull request #10095 from crh0716/865995_a

Bug 865995 - Reset all items to the original state after selecting an operator(cherry picked from commit 532aa06d1c57f8db4bae044be2f1ba6e0cccc34b)

Conflicts:
	apps/settings/js/carrier.js
Merge pull request #10758 from leob2g/Bug_888151_Alarmlist_Alarm_label_and_Repeat_days_overlap

[Bug 888151] In Alarmlist Alarm Label And Repeat days overlap correction r=ianliu(cherry picked from commit 0b69872841d5df17df192968fa6d766c1f592864)
Merge pull request #10751 from gabrielesvelto/bug-888184-v1-train

Bug 888184 - Remove the canvas-based animations introduced in the workaround for bug 822345 r=alive
Bug 854759 - maintain the correct app size with keyboard when the
attention screen is hidden. r=Alive
Bug 840147 & Bug 877903 : fix orientation problem on open/close app animation.
                          * Open app by real device orientation
                          * Refactor setAppSize and rotateTransition to AppWindow
Bug 890079 - Homescreen grid tests failing in TBPL with: document.createTouch is not a function r=crdlc a=npotb

don't try to send touch events if document.createTouch is missing.
(cherry picked from commit 3f51aa0913ad86b50abd97d2b25e07b59677708c)
Bug 878820 - Contacts imported from VCF files disappear [r=arcturus]

- Using mozContacts now
- Isolated functionality to make it easier to test
- Added Unit tests

Conflicts:
	apps/communications/contacts/js/utilities/vcard_parser.js
	apps/communications/contacts/test/unit/vcard_parsing_test.js