Bug 932753 - Update test_settings_do_not_track to use new Gecko pref helper methods
Bug 932209 - Do not automatically close the app if there are pending messages waiting to be processed r=julienw
Merge pull request #13976 from aniruddha-adhikary/master

Bug 842592: Adding Bangla Input Method for B2G.
r=rudylu(cherry picked from commit 47161c8a657c25ee7b29c84ce3b4e4df191c09a0)
a=timdream

Conflicts:
	.jshintignore
Bug 943313 - AttributeError: 'builtin_function_or_method' object has no attribute 'sleep' after adding power draw support. r=dhunt
Bug 927870 - Neaten up UI Tests app's app object
Bug 943298 - In SIM import-export contacts flows avoid creating new entries in the SIM card
Merge pull request #14163 from jmcanterafonseca/fix_import_export_flows

Bug 943298 - In SIM import-export contacts flows avoid creating new entr...
Merge pull request #14031 from bobsilverberg/bug932753-1.2

Bug 932753 - Update test_settings_do_not_track to use new Gecko pref helper methods
Bug 944645 - [v1.2] Unxfail test_gallery_crop_photo.py
Bug 943008 - Enable pinning of marionette_client package in setup.py. r=dhunt
Bug 943337 - Merge all 2 kill cards view tests into one.
Merge pull request #14212 from AndreiH/bug944645

Bug 944645 - [v1.2] Unxfail test_gallery_crop_photo.py
Merge pull request #14131 from AndreiH/bug927870_v1.2

Bug 927870 - Neaten up UI Tests app's app object
Bug 934446 - Test Messages contact input validation
Enabling the test on tbpl for v1.2
migrate music app tests to app object
Bug 937584 - Modify test_sms_to_dialer.py to use SendSMS atom

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/messages/app.py
Merge pull request #14230 from bobsilverberg/tbpl_contact_input

Bug 934446 - Test Messages contact input validation
Merge pull request #14261 from bobsilverberg/pr14027

Bug 921514 - Create app object for the Music app
Bug 943441 - test_import_contacts_from_gmail is failing on master for the wrong reason
Bug 945368 - [v1.2] Xfail test_everythingme_app_install.py due to long_press bug