Bug 932385 - Calling moztelephony.active is hanging the device, try UI level solution instead
Merge pull request #13330 from bobsilverberg/cp932385

Bug 932385 - Calling moztelephony.active is hanging the device, try UI level solution instead
Merge pull request #13320 from bobsilverberg/cp927029

Bug 934227 - [v1.2] Uplift contact import and export tests from master
Bug 929636 - Changed skipped Python UI tests to use fail-if

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/cards_view/manifest.ini
	tests/python/gaia-ui-tests/gaiatest/tests/functional/everythingme/manifest.ini

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/cards_view/manifest.ini