Bug 978689 - [Settings] Fix for() loop in carrier.js file.
Merge pull request #12448 from comoyo/render_speed

Bug 875963 - Switch case without rebuilding keyboard. r=RudyL(cherry picked from commit 74f49f0a1ba192056a4e529d3b1290144374011a)

Conflicts:
	apps/keyboard/js/render.js
Merge pull request #15309 from comoyo/bug959175

Bug 959175 - Force redraw on uppercase switch when layout has secondLayout flag. r=RudyL(cherry picked from commit e553ba3a0cdf9b4bfaa4d946279e31a0eacb2806)

Conflicts:
	apps/keyboard/js/render.js
Merge pull request #17019 from RudyLu/Bug875963_uplift_1.3T

Uplift Bug 875963 and Bug 959175 to 1.3t
a=1.3T+
Merge pull request #16399 from comoyo/972276

Bug 972276 - Cache window size on event to avoid reflows. r=RudyLu(cherry picked from commit 21f1e8abf530c7fe9043a4c526ec1c506825610a)
Merge pull request #16373 from comoyo/bug964739

Bug 964739 - Call resizeUI on keyboard if orientation changed since last time. r=RudyLu(cherry picked from commit 18e305c4616e92df6f25bce619ca08b2ad5398d1)
Merge pull request #17024 from RudyLu/uplift_Bug972276_v1.3t

Uplift bug 972276 and bug 964739 to v1.3t.
a=v1.3T+
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 branch 'v1.3' into v1.3t
Merge pull request #16324 from vingtetun/bug969544

Bug 969544 - Toggling the highlighted class of a keyboard key create ref...(cherry picked from commit 6e9b110a7a0c8d99bcfd5ab05b83da6dc44a292a)
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
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