Bug 988037 - [B2G][Video] WebM videos attached in email do not display properly when previewed in email app
Bug 991597 - [v1.3] Fix test_settings_wifi.TestSettingsWifi on v1.3
Bug 991644 - [v1.3] test_settings_airplane_mode.TestAirplaneMode also fails on v1.3 with bug 987145
Bug 991679 - [v1.3] Investigate and try to fix test_ftu_skip_tour.TestFtu fails on v1.3
Merge pull request #17931 from russnicoletti/bug988037

Bug 988037 - [B2G][Video] WebM videos attached in email do not display properly when previewed in email app r=johu
Merge pull request #17457 from punamdahiya/Bug975599

Bug975599 - [Gallery] - Slightly cropping an image from gallery so that more does not attach to MMS
Bug 986358 -[Sora][IOT] Not SIM inserted message appears when SIM is alrady inserted

Conflicts:
	apps/costcontrol/js/widget.js
Merge pull request #17945 from AndreiH/bug_991597

Bug 991597 - [v1.3] Fix test_settings_wifi.TestSettingsWifi on v1.3
Merge pull request #17947 from AndreiH/bug_991679

Bug 991679 - [v1.3] Investigate and try to fix test_ftu_skip_tour.TestFt...
Merge pull request #17946 from AndreiH/bug_991644

Bug 991644 - [v1.3] test_settings_airplane_mode.TestAirplaneMode also fa...
Bug 991659 - [v1.3] Backport Music tests to v1.3
Merge pull request #17958 from gitmai/bug-986358-rebase-1.3

Bug 986358 -[Sora][IOT] Not SIM inserted message appears when SIM is alr...
Merge pull request #17897 from arcturus/bug-990496

Bug 990496 - [Contacts] Error when user tries to cancel importing contacts

Conflicts:
	apps/communications/contacts/js/utilities/http_rest.js
Bug 990496 - Remove stray '{' that crept in while rebasing. a=bustage
Bug 991657 - [v1.3] Backport test_cards_view_with_two_apps.py test to v1.3

Replace test_cards_view_launch_app.py and test_cards_view_with_three_apps.py with the above test
Include a number of changes to gata_test from master which are needed
Pin to marionette-client 0.7.1.1 which is needed for v1.3
Merge pull request #17972 from viorelaioia/bug_991659

Bug 991659 - [v1.3] Backport Music tests to v1.3
Bug 991653 - [v1.3] Backport test_power_button_long_press.py test to v1.3

This pulls in a commit for:
Bug 968751 - Write a test to open long-press power button menu
Merge pull request #17867 from RudyLu/keyboard/Bug990372

Bug 990372 - [Sora][Message]The virtual keyboard disable after do some
r=janjongboom(cherry picked from commit 73c00d27db9835c82c92fbb03578f7ad177a2932)
a=v1.3+, bajaj
Bug 992758 - Remove the unnecessary keyboard unit tests.
Merge pull request #18014 from RudyLu/keyboard/Bug992758-remove_unnecessary_unitTests

Bug 992758 - Remove the unnecessary keyboard unit tests.
r=yuren.
a=test-only.