Bug 938051 - Intermittent failure in test_delete_contact
Bug 938707 - Fix failure of test_settings_do_not_track
Bug 939979 - Unxfail test_context_menu_activity_picker.py
Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/system/manifest.ini
Merge pull request #13830 from bebef1987/del_cont

Bug 938051 - Intermittent failure in test_delete_contact
Bug 935587 - test_sms_add_contact.py - Adjust assertion and enable test for Travis
Bug 939979 - Enable test_context_menu_picker.py r=me a=testonly
Merge pull request #13833 from teodosia/sms-contact-v1.2

Bug 935587 - test_sms_add_contact.py - Adjust assertion and enable test for Travis
Bug 937532 - Migrate calendar tests to use an app object
Merge pull request #13831 from AndreiH/fix_dnt_v1.2

Bug 938707 - Fix failure of test_settings_do_not_track
Merge pull request #13842 from AndreiH/calendar-app-object_v1.2

Bug 937532 - Migrate calendar tests to use an app object