Bug 935433 - Merge test_clock_all_items_present_new_alarm assertions into existing tests
bug 936364 Address test_settings_wallpaper.py intermittent
Bug 925854 - Re-enable test_gallery_edit_photo
Merge pull request #13342 from RudyLu/settings/Bug913784-language_keyboard_mapping

Bug 913784 - Language selection should also enable associated built-in
r=gnarf, arthur(cherry picked from commit 5cf3e2972c4d623ab0759ad85f6c4673ed9ed75f)

Conflicts:
	apps/settings/js/settings.js
	shared/resources/keyboard_layouts.json
[v1.2] Bug 937344 - Replace get_all_video files in test_camera_capture_video with video_files property
Merge pull request #13588 from bebef1987/gallery

Bug 925854 - Re-enable test_gallery_edit_photo
Merge pull request #13504 from jaoo/927486

Bug 927486 - [Settings] Modify Message settings category. r=arthurcc(cherry picked from commit 49b3e8cc689e1c189a86e28c20bc4726d553ee03)

Conflicts:
	apps/settings/elements/carrier_mms_settings.html
	apps/settings/index.html
Bug 937629 - Reenable test_cards_view_kill_app_with_three_apps.py
Bug 937079 - test_gallery_view.py is not switching to landscape view
Bug 936533 - test_settings_bluetooth.py is failing, please fix
Bug 937068 - Unxfail and enhance wait in test_contact_add_photo
Merge pull request #13623 from AndreiH/bug936533_1.2

Bug 936533 - test_settings_bluetooth.py is failing, please fix
Bug 937644 - xfail send email tests on 1.2
Merge pull request #13621 from AndreiH/bug937079_v1.2

Bug 937079 - test_gallery_view.py is not switching to landscape view
Bug 937118 - Bump marionette_client dependency because of bug 937097. r=dhunt
Merge pull request #13506 from AndreiH/bug935433_1.2

Bug 935433 - Merge test_clock_all_items_present_new_alarm assertions int...
Merge pull request #13518 from bebef1987/936364

bug 936364 Address test_settings_wallpaper.py intermittent
Merge pull request #13620 from bebef1987/enable_three_apps

Bug 937629 - Reenable test_cards_view_kill_app_with_three_apps.py
Merge pull request #13626 from bebef1987/xfail_email

Bug 937644 - xfail send email tests on 1.2
Revert "Merge pull request #13338 from evanxd/bug-925961"

This reverts commit 5eff7b00f3acaef6144d050a357b6d33e46807a9.

Because this commit is causing bug 937639