Bug 964233 - [v1.3] Increase timeout when waiting for mms with attachment to be sent
Bug 968224 - [1.3] Update locator in tap_hang_up method
Merge pull request #15950 from gtorodelvalle/contacts-967540-invalid-dates-in-gmail

Bug 967540 - [Contacts] Exporting to SD card contacts imported from Gmail with invalid dates never ends
(cherry picked from commit 95cea779da64742c1f46da1a628c8c7a21604d8e)

Conflicts:
	build/jshint/xfail.list
Bug 945481 - [Messages] Implement position:sticky for fixed headers r=julienw
Merge pull request #15953 from bobsilverberg/mms_timeout

Bug 964233 - [v1.3] Increase timeout when waiting for mms with attachmen...
Merge pull request #15986 from viorelaioia/bug_968224

Bug 968224 - [1.3] Update locator in tap_hang_up method
Merge pull request #16023 from KevinGrandon/bug_945481_sms_sticky_headers_1_3

Bug 945481 - [Messages] Implement position:sticky for fixed headers r=julienw
Merge pull request #15993 from jaoo/934916

Bug 934916 - [WAP push][CP] If a CP message is opened, newly coming CP or WAP push messages can still be opened but content is not displayed. r=gsvelto(cherry picked from commit 3ad11b1058a0ec4e9a64d7a786e7863b7bff27e5)

Conflicts:
	apps/wappush/test/unit/wappush_test.js
Revert "Merge pull request #15653 from dominickuo/bug-946556"

This reverts commit f9a37c77efb4621a1f57e4695b497d18601fe134.
Bug 968850 - [v1.3]Unxfail test_sms_with_attachments.py as Bug 964233 was fixed
Merge pull request #16049 from viorelaioia/bug_968850

Bug 968850 - [v1.3]Unxfail test_sms_with_attachments.py as Bug 964233 wa...
Merge pull request #16039 from dominickuo/bug-946556-new

Bug 946556 - [Music] Disable the play controls when using a bluetooth headset in a call, r=jimporter(cherry picked from commit 0ed0da7ea8c31e6df902deadaef4012f12911c39)

Conflicts:

	apps/music/index.html
Bug 942199: Allow minimum EXIF preview size to be configured at build time for Camera and Gallery
Merge pull request #15976 from RudyLu/keyboard/Bug963377-keyboard_covers_value_selector

Bug 963377 - [B2G][Keyboard] Keyboard blocks "cancel" / "ok" options, r=timdream(cherry picked from commit 1aa8e778a0368e98eb1b5d534285a47c29068951)
Merge pull request #16028 from RudyLu/keyboard/Bug968729-add_unit_test

Bug 968729 - Add unit test for Bug 963377.
r=timdream(cherry picked from commit 3fc26ae786e3869a7ef1e23afc9807ac1b4741f2)
a=test-only

Conflicts:
	build/jshint/xfail.list
Merge pull request #16053 from vingtetun/bug967277.followup

Bug 967277 - [Contacts] Scrolling the contacts app causes reflow. Follow...
Merge pull request #15968 from jaoo/947855

Bug 947855 - Automatic selection of APN relying on the IMSI code in the ICC card. r=kaze
(cherry picked from commit f0f269123886391106ebb37ce738274c1c91df84)
Merge pull request #14298 from dwi2/bug938080

Bug 938080 - set 'xyz'.suspended to false if user toggle 'xyz'.enabled on manually r=crh0716
(cherry picked from commit 7689a80de843f12ad99b0fd6c19cb7040aba0634)
Merge pull request #16024 from jmcanterafonseca/fb_sync_fixed

Bug 952691 - [B2G][Contacts][Facebook Sync]Contacts imported from Facebo...
(cherry picked from commit 0417f87b62b9b7ebbc48c1e9e1e3a144e0b64d70)
Merge pull request #16047 from flodolo/bug968778

Bug 968778 - [browser] "Cancel" is hard-coded in the dialog appearing when long tapping on a link r=benfrancis
(cherry picked from commit b374f60685d624008bb55b50f0127136493d221b)