bug 932491 - Address intermittent errors in test_clock_set_alarm_snooze.py
Bug 939836 - Unxfail test_send_imap_email & test_send_active_sync_email
Bug 939839 - Unxfail test_gallery_edit_photo
Bug 933079 - [e-mail] gmail connections not noticing new messages properly
Bug 926360 - Write a test to use the 'URL' keyboard
Uplift to v1.2
Merge pull request #13805 from AlinT/unxfail_edit_photo_test

Bug 939839 - Unxfail test_gallery_edit_photo
Merge pull request #13811 from mcav/fix-gmail-email-polling-v1.2

Bug 933079 - [e-mail] gmail connections not noticing new messages properly. r=asuth a=koi+
Bug 938262 - Set default selection based on the current permission setting
Merge pull request #13803 from AlinT/unxfail_email_tests

Bug 939836 - Unxfail test_send_imap_email & test_send_active_sync_email
Merge pull request #13812 from bobsilverberg/url_keyboard

Bug 926360 - Write a test to use the 'URL' keyboard
Merge pull request #13735 from crh0716/938262

Bug 938262 - Set default selection based on the current permission setting r=evelyn
Merge pull request #13671 from bobsilverberg/bug932491

bug 932491 - Address intermittent errors in test_clock_set_alarm_snooze.py
Bug 938051 - Intermittent failure in test_delete_contact
Bug 917196 - When short tones are enabled make audible tones short too r=etienne
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