Bug 978689 - [Settings] Fix for() loop in carrier.js file.
Merge pull request #16938 from crdlc/bug-978011

Bug 978011 - Unload properly Image Loader when syncing/importing
Merge pull request #16982 from steveck-chung/bug-973007

Bug 973007 - [B2G] [Messaging] Keyboard appears when accessing the contact list from the compose message screen. r=julienw
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
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 pull request #16980 from EragonJ/v1.3-bug-979751

Bug 979751 - [Security setting] Redundant "Enter PUK code" page shows