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 969101: Initial implementation of a first-time use ping. r=fabrice
Bug 991509 - Adding Tamil input method for B2G (v1.3t)
Merge pull request #18405 from luke-chang/991509_v1.3t_tamil_input_method

Bug 991509 - Adding Tamil input method for B2G (v1.3t), r=rudylu
Merge pull request #14577 from Rik/stop-ringtone-power-button-890434

Bug 890434 - Impossible to silence an incoming call without rejecting it r=etienne
Conflicts:
	apps/communications/dialer/test/unit/calls_handler_test.js
Bug 991666 - Fix removal of old API notifications when selected from the toaster r=alive
Merge remote-tracking branch 'upstream/v1.3' into mergin-1.3-in-1.3t-april-18

Conflicts:
	apps/callscreen/js/calls_handler.js
	apps/callscreen/test/unit/calls_handler_test.js
Merge pull request #18451 from etiennesegonzac/mergin-1.3-in-1.3t-april-18

Mergin 1.3 in 1.3t april 18
Merge pull request #17859 from marshall/ftuPing_v1.3

Bug 969101: Initial implementation of a first-time use ping. r=fabrice
Merge branch 'v1.3' into v1.3t

Conflicts:
	.jshintignore
	build/settings.js
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