Bug 999053: [FTU Ping] Handle multisim situations more gracefully when collecting network info. r=fabrice

Conflicts:

	apps/system/test/unit/ftu_ping_test.js
Merge pull request #20041 from davidflanagan/bug1020273

Bug 1020273: make the Gallery crop handles more sensitive r=pdahiya(cherry picked from commit a44346be68f23782d6b24426ed085d62856f9273)
Merge pull request #20104 from marshall/bug995434_ftuPingSimLocked_v1.4

Bug 999053: [FTU Ping] Handle multisim situations more gracefully when collecting network info
Merge pull request #20108 from davidflanagan/bug1020273-v1.4

Bug1020273 v1.4
Merge pull request #18432 from zbraniecki/995425-upgrade-sinon

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
Bug 1011645 - [B2G][Lockscreen] When unlocking a phone with a passcode, the user will see a blank homescreen with no apps
Merge pull request #20058 from mnjul/bug_1011645_lockscreen_passcode_camera_button_stall_v1.4

Bug 1011645 - [B2G][Lockscreen] When unlocking a phone with a passcode, the user will see a blank homescreen with no apps - v1.4