Bug 1004407 - [Tarako] [e.me] Show marketplace category icon only for Tarako collections [r=ranbena]
Bug 1008061 - [OPEN C_1.3] There are two input text in "Enter NCK code" windows
Merge pull request #19143 from EragonJ/v1.3-bug-1008061

Bug 1008061 - [OPEN C_1.3] There are two input text in "Enter NCK code" windows
Bug 1006356 - Fix the unit test for v1.3t
Bug 1007573 - [Tarako][Contacts]After merge contact or add contact to my favorite, cannot edit
Merge pull request #18857 from EverythingMe/v1.3t

Bug 1004407 - [Tarako] [e.me] Show marketplace category icon only for Ta...
Merge pull request #19379 from lissyx/bug1006356-v1.3t

Bug1006356 v1.3t r=etienne_s
Merge branch 'v1.3' into v1.3t
Bug 1010418 - Answering a call from the Lockscreen then adding a contact to the call will bring the user to the homescreen

Revert "Merge pull request #17230 from snowmantw/issue982530-workaround"

This reverts commit 712846a016f807de4a8e6823bbf468c3a220ac0a, reversing
changes made to ed572dfcbee138edbc9483d41cb67a5128852313.

Conflicts:
	apps/system/js/lockscreen.js
Merge pull request #19394 from sergi/v1.3t

Bug 1007573 - [Tarako][Contacts]After merge contact or add contact to my favorite, cannot edit. r=bkelly
Merge pull request #19463 from Rik/1010418-backout

Bug 1010418 - Answering a call from the Lockscreen then adding a contact to the call will bring the user to the homescreen r=me because backout.