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 #15959 from EragonJ/bug-967708

Bug 967708 - [B2G][l10n][Settings] German: "Change PIN" doesn't use loca...
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