Bug 917207 - Create a system region for cards view and migrate tests to use it
Bug 920449 - Refactor test_cards_view_with_one_app.py

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/cards_view/manifest.ini
Bug 918727 - Update locator for video tests. r=zcampbell r=fstrugariu

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/videoplayer/app.py
Bug 934132 - [v1.2] Update lockscreen app and tests to be in line with master
Incorporate changes from commit 5ff9232461a9d562e0a608c4b17b08efc723145f
Bug 924880 - Need an extra wait in test_unlock_to_camera_with_passcode
Bug 922702 - Investigate test_connect_to_wifi_via_settings_app
Unxfail test marketplace can add review
Bug 923402 - In test_fmradio_remove_from_favorite.py the remove method should wait for the favourite to be removed
Bug 924882 - test_setup_active_sync needs extra wait for setup screen, r=zac
Bug 925844 - Allow override of load timeout in Browser app object's go_to_url method, r=zac
bug 927873 - Python browser tests - offset tap in browser app object to bust the app update notification interrupting the test
Bug 926932 - Merge the tests in test_clock_create_new_alarm.py
Bug 926920 - Merge the two tests in test_clock_switch_clock_type.py
Bug 926944 - Add a recipient to an SMS using the Contacts app, r=zac

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/contacts/app.py
Bug 925850 - Modify the test_dialer_make_call assertion to handle long phone numbers
Bug 924114 - Migrate homescreen tests to use app objects
Bug 930044 - Python UI tests Enhance wait in test_sms_with_attachments to wait for messages app to resize the attached image
Bug 923355 - wait for setting to be set after switching dnt toggle
Bug 927126 - Expand automated coverage around editing of gallery photos
Bug 933980 - [v1.2] Fix test_ftu_with_tour.py and reenable on v1.2