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 #16964 from dominickuo/bug-973156-new-2

Bug 973156 - [Music] Send mozinterruptbegin and mozinterruptend to system for show/hide the media playback widget, r=jimporter(cherry picked from commit b83a79969718ea189cdc5cfa55d40fee38c11cb6)

Conflicts:

	apps/system/test/marionette/media_playback_test.js
Bug 974733 - [Sora][Message] We should not change panels when handling the "sending" event on the window that does not send the message r=schung

When the user presses the "send" button, we set a boolean, so
that when we receive the "sending" event, we know whether we're in the same
window.

(cherry picked from commit a8c1a5ad0936cf5c131afaf2bb5cf6b068e8535d)

Conflicts:
	apps/sms/js/thread_ui.js
	apps/sms/test/unit/thread_ui_test.js
Revert "Merge pull request #15774 from wanderview/opus-json"

This reverts commit 07343183ae1528af1ad1633f49d91f09d4107b35.
Merge pull request #16951 from steveck-chung/Bug-976999

Bug 976999 - [Sora][Message][MMS]Some of the text content lost when forward the MMS. r=julienw
Conflicts:
	apps/sms/test/unit/compose_test.js
Merge pull request #16910 from gtorodelvalle/contacts-bug-972600-add-contact-after-merging

Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen (r=arcturus)
Merge pull request #16791 from jaoo/978689

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

Bug 979751 - [Security setting] Redundant "Enter PUK code" page shows
Merge pull request #17112 from sprd-ffos/v1.3t

Bug 894744 - Use localStorage event to make inter-page communication bet...
Bug 949796 - brief flash of tiny buttons after focusing e.me search box on homescreen [r=ranbena]
Bug 979406 - Don't wait 600ms before vibrating when receiving a call.
r=rik
Merge pull request #17122 from etiennesegonzac/bug-979406-v1.3t

Bug 979406 - Don't wait 600ms before vibrating when receiving a call.
Merge pull request #17125 from leonazhao/v1.3t

Bug 949796 - brief flash of tiny buttons after focusing e.me search box ...
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