Bug 1008974 - [DSDS][Dialer] Queue taps and ignore long presses on MSAB until settings have been loaded. r=rik
Bug 993236 - [dsds] Access Cellular & Data setting (Two SIM inserted)

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/settings/manifest.ini
Bug 993236 - Update test_settings_dsds_cell_data as per review comments
Bug 993236 - Resolve syntax error in manifest file a=testonly r=me
Bug 1020236 - [flame][v1.4] Disable test_settings_sim_manager.py
Merge pull request #19999 from AndreiH/bug_1020236

Bug 1020236
Bug 1020252 - [flame][v1.4] test_system_message.TestSystemMessages is failing on v1.4
Bug 1020298 - "Add videos to get started" message is shown when opening Video app
Merge pull request #20016 from AndreiH/bug_1020252

Bug 1020252 - [flame][v1.4] test_system_message.TestSystemMessages is failing on v1.4
Bug1011460 - Wallpaper picker flickering r=djf
Bug 1012845 - [B2G][Gallery] When deleting downloaded images from the download settings, the image will not delete
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