Bug 972666 - [Calendar] lines over events longer than 2 hours
Bug 976503 - Properly handle incoming messages with a 'si-id' field r=julienw

(cherry picked from commit 065154bf60176b0a17c34c4db4bcc384d2d894a5)

Conflicts:
	apps/wappush/js/wappush.js
Revert "Bug 972666 - [Calendar] lines over events longer than 2 hours"

This reverts commit 8aed4fafbaeb86d6884d31ce7d3cbeb87bcbf837.
Bug 972666 - [Calendar] lines over events longer than 2 hours
Merge pull request #16914 from julienw/979983-v1.3-fix-gjslint-issues

Bug 979983 - Fix gjslint issues on v1.3
Merge pull request #15668 from mukeshk1990/Bug_947086_Dialer_may_call_CDMA-specific_bluetooth_functions_on_non-CDMA_phone

Bug 947086 - [Dialer] Dialer may call CDMA-specific bluetooth functions r=etienne
(cherry picked from commit b58937b36da25e627d65a6aad38ecabaca6f3ffe)
Merge pull request #16631 from jaoo/971816

Bug 971816 - [OTA][Data Migration] Voicemail number will restored back default setting in SIM card after updating from v1.1 to v1.3. r=qDot
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
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