Bug 1020298 - "Add videos to get started" message is shown when opening Video app
Bug1011460 - Wallpaper picker flickering r=djf
Bug 1020206 - [flame][v1.4] Flicking is not done in test_radio_frequency_dialer
Bug 1020928 - [flame][v1.4] test_ftu_skip_tour.TestFtu is failing on v1.4
Merge pull request #20080 from AndreiH/bug_1020928

Bug 1020928 - [flame][v1.4] test_ftu_skip_tour.TestFtu is failing on v1.4
Bug 1020964 - [flame][v1.4] test_settings_power_save_mode.TestPowerSaveMode fails intermittently
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 #20067 from AndreiH/bug_1020206

Bug 1020206 - [flame][v1.4] Flicking is not done in test_radio_frequency_dialer
Merge pull request #20085 from AndreiH/bug_1020964

Bug 1020964 - [flame][v1.4] test_settings_power_save_mode.TestPowerSaveMode fails intermittently
Merge pull request #20018 from AndreiH/bug_1020298

Bug 1020298 - "Add videos to get started" message is shown when opening Video app
Merge pull request #20025 from punamdahiya/Bug1011460_v1.4

Bug1011460 - [Flame] Wallpaper picker flickering r=-djf
Merge pull request #19956 from davidflanagan/bug996455

Bug 996455: use device pixels, not css pixels when determining if an EXIF preview is big enough r=pdahiya a=1.3+,hkoka
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