Bug 989847 - Handle webgl context lose/restore event for gallery editor mode
Bug 991628 - [Settings][OMA CP] Not possible to select an APN received via OMA CP message if there is already one with the same name
Bug 997051 - [Gallery] the MAX_IMAGE_SIZE in inline viewer doesn't not use customization config value
Bug 998213 - [Tarako][Keyboard] Unable to input keys after doing some steps
 - Wait for initializing the layout and IM engine and then show the
   keyboard.
Merge pull request #18486 from RudyLu/keyboard/Bug998213-v1.3t

Bug 998213 - [Tarako][Keyboard] Unable to input keys after doing some st...
r=timdream
Merge pull request #18217 from etiennesegonzac/bug-993807-network-initiated-mmi

Bug 993807 - Making sure the MmiManager is initialized for network initiated MMI sessions. r=rik
Bug 969609 - [B2G][Email]Opening an email notification then pressing back in the email app leads to a black screen.

Manual v1.3 branch merge from master commit 2a439c1dd68b9336b7b0ff14df9b742943aa61bf
Merge pull request #18493 from jrburke/bug969609-v1.3-email-notification-black-screen

Bug 969609 - [B2G][Email]Opening an email notification then pressing back in the email app leads to a black screen. r=asuth a=bajaj
Bug 985598 - [email] Double-triggering of share/new activity by clicking on a mailto link results in black screen

v1.3 branch merge from master of commit c3b1f1fe0ee3e00903858333412b6de94f194629
Merge pull request #18495 from jrburke/bug985598-v1.3-email-double-activity-blank

Bug 985598 - [email] Double-triggering of share/new activity by clicking on a mailto link results in black screen r=asuth a=bajaj
Merge branch 'v1.3' into v1.3t
Merge pull request #18001 from JerryShih/bug-989847-handle-lost-context-in-gallery-1.3T

Bug 989847 - Handle webgl context lose/restore event for gallery editor mode
Merge pull request #18358 from huchengtw-moz/gallery/Bug_997051-use-config-value

Bug 997051 - [Gallery] the MAX_IMAGE_SIZE in inline viewer doesn't not u...
Bug 995148 - [Tarako][Gallery] Gallery exits when loading some specific pictures
Merge pull request #18362 from huchengtw-moz/gallery/Bug_995148-file-size-filter

Bug 995148 - [Tarako][Gallery] Gallery exits when loading some specific ..., r=djf
Bug 998845 - [System] set the last play status to STOPPED if the media app is killed before the incoming call
Bug 991831 -[B2G][Tarako][Cost Control] The data usage bar in the notifications pull-down menu loads in slowly
Bug 988760 - Workaround for glitchy sound when playing the busytone r=etienne

(cherry picked from commit d3a918483a7342052ede64bcb5dc6c72f5356212)

Conflicts:
	build/jshint/xfail.list
Bug 991897 - [B2G][Tarako][Browser] Adding a webpage to the homescreen is not functioning correctly
Merge pull request #18488 from crdlc/bug-991897

Bug 991897 - [B2G][Tarako][Browser] Adding a webpage to the homescreen i...