Bug 978689 - [Settings] Fix for() loop in carrier.js file.
Bug 977934 - Render activity inside caller
Bug 979751 - [Security setting] Redundant "Enter PUK code" page shows

after enter incorrect PIN code three times.

- update logic
- add unit test
Merge pull request #16791 from jaoo/978689

Bug 978689 - [Settings] Fix for() loop in carrier.js file.
Merge pull request #16980 from EragonJ/v1.3-bug-979751

Bug 979751 - [Security setting] Redundant "Enter PUK code" page shows
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 #16890 from alivedise/bugzilla/977934_v1.3/render-activity-inside-caller

Bug 977934 - Render activity inside caller
Bug 981521 - Display notifications for messages with a "signal-none" action r=julienw

Conflicts:
	apps/wappush/js/wappush.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.