Bug 982599 - [v1.3] Test test_ftu_skip_tour.TestFtu fails on CI
Bug 958470 - [Ringtones] set ringer type to the ringtones player
Bug 982642 - [v1.3] test_persona_cookie.TestPersonaCookie intermittent fail
Merge pull request #15190 from timdream/lockscreen-secure-camera

Bug 958425 - Stop copying Camera app to System app, r=alive, r=johu, r=yuren(cherry picked from commit ee0ed4c0f10f18d13957626371f0bce09e4d6303)

Conflicts:

	apps/camera/js/app.js
	apps/camera/test/unit/app_test.js
	build/multilocale.js
Bug 983111 - [v1.3] test_play_3gp_video.TestPlay3GPVideo intermittently fail
Merge pull request #17127 from AndreiH/bug_982599

Bug 982599 - [v1.3] Test test_ftu_skip_tour.TestFtu fails on CI
Merge pull request #17132 from AndreiH/bug_982642

Bug 982642 - [v1.3] test_persona_cookie.TestPersonaCookie intermittent f...
Merge pull request #17157 from AndreiH/bug_983111

Bug 983111 - [v1.3] test_play_3gp_video.TestPlay3GPVideo intermittently ...
Merge pull request #16929 from dominickuo/v1.3-bug-958470

Bug 958470 - [Ringtones] set ringer type to the ringtones player
Revert "Bug 958470 - [Ringtones] set ringer type to the ringtones player"

This reverts commit 13906bac7505f08f41f3c4971edceafab0118387.
Merge pull request #14719 from lissyx/bug890440

Bug 890440 - Disable system workarounds for notification sent with the deprecated API r=alive
(cherry picked from commit b84aa4ba45f5f5e069bbc3b83270fc6e5d53bbd9)

Conflicts:
	apps/system/js/notifications.js
Merge pull request #17041 from asutherland/email-wait-for-greeting

Bug 977867 - [email/IMAP] wait for server greeting before sending commands to workaround gmail issue. r=mcav a=blocking-b2g=1.3+
Revert "Bug 981521 - Display notifications for messages with a "signal-none" action r=julienw"

This reverts commit 6194def5ceed3f4b9bc9de0ea2c11661cd439a27.
Revert "Merge pull request #16910 from gtorodelvalle/contacts-bug-972600-add-contact-after-merging"

This reverts commit bfc6b263d296bd32422164d8f42097a4dc52c39c.
Merge branch 'v1.3' into v1.3t
Merge pull request #17169 from mikehenrty/v1.3-uplift

Merge pull request #14719 from lissyx/bug890440, r=alive
Merge pull request #17152 from evelynhung/issue-958425-1.3t

Merge pull request #15190

Bug 958425 - Stop copying Camera app to System app, r=alive, r=johu, r=yuren (cherry picked from commit ee0ed4c)
Merge pull request #15466 from julienw/956276-duplicate-event

Bug 956276 - [ZTE]-Two or more instances of open activity will be launch...
(cherry picked from commit 73898bf32b3da33a0de96438302feb21635285aa)

Conflicts:
	apps/system/test/unit/notifications_test.js
Bug 983176 - [B2g][Contacts] Unresponsive done button while searching FB contacts
Merge pull request #17182 from crdlc/bug-983176-v2

Bug 983176 - [B2g][Contacts] Unresponsive done button while searching FB...