Bug 1011645 - [B2G][Lockscreen] When unlocking a phone with a passcode, the user will see a blank homescreen with no apps
Bug 1020002: don't allow an activity choice that could subvert forward-lock
Bug 1020002: don't allow an activity choice that could subvert forward-lock
Bug 1020628 - Don't allow user to start activity twice in keyboard settings
Merge pull request #19374 from mnjul/bug_1011645_lockscreen_passcode_camera_button_stall_v1.3

Bug 1011645 - [B2G][Lockscreen] When unlocking a phone with a passcode, the user will see a blank homescreen with no apps - v1.3
Bug 1022466 - [Music][System] Remove State Manager in Music and restoring logic in Media App Agent
Merge pull request #20258 from jonallengriffin/bug1023001

Bug 1023001 - Use * as maxVersion for b2gdesktop extensions, a=RyanVM
Merge pull request #18432 from zbraniecki/995425-upgrade-sinon a=tests-only

Bug 995425 - upgrade sinon to 1.9.1 and update API usage. r=julienw
(cherry picked from commit a338645d27c509f064ac3365ca2acc50a08fceb5)

Conflicts:
	apps/costcontrol/test/unit/widget_startup_test.js

(cherry picked from commit 83cae7b7510fc837e27ecd0e298aa462e61f7761)

Conflicts:
	apps/callscreen/test/unit/bluetooth_helper_test.js
	apps/callscreen/test/unit/calls_handler_test.js
	apps/system/test/unit/fxa_manager_test.js
Bug 1018086 - part2: fix jslint error -[tarako] Need a way to dispatch 'headset-button' system message to engineering mode app r=alive
Merge pull request #20351 from julienw/995425-uplift-upgrade-sinon

Bug 995425 uplift upgrade sinon
Merge pull request #20092 from davidflanagan/bug1020002-v1.3t

Bug1020002 v1.3t
Merge pull request #20354 from arvin-zhang/bug1018086_fix_jslint_error_v1.3t

Bug 1018086 - part2: fix jslint error
Merge pull request #20093 from davidflanagan/bug1020002-v1.3

Bug1020002 v1.3
Bug 1023878 - make sure we stop if the make targets fail. r=julienw a=npotb
Revert "Bug 1023878 - make sure we stop if the make targets fail. r=julienw a=npotb"

This reverts commit bc6b283729308fad276fe2e64b7e1d3ed3e6b463.
Merge branch 'v1.3' into v1.3t
Merge pull request #19464 from petervanderbeken/1013802

Bug 1013802 - Include utils.js in hotspot_test.js so that openDialog is defined r=crh0716
(cherry picked from commit 1b5ea790c10f3ae4fc1c08f04df8c59777b3ef73)

a=tests
Merge pull request #19464 from petervanderbeken/1013802

Bug 1013802 - Include utils.js in hotspot_test.js so that openDialog is defined r=crh0716
(cherry picked from commit 1b5ea790c10f3ae4fc1c08f04df8c59777b3ef73)

a=tests
Merge pull request #20260 from dominickuo/v1.3t-bug-1022466

Bug 1022466 - [Music][System] Remove State Manager in Music and restoring logic in Media App Agent
Bug 1010748 - Update sockit-to-me