bug 938061 - final  - r=zac

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/system/manifest.ini
Bug 945376: correctly handle the None alert tone setting
(cherry picked from commit 19dba5709ee860750765636f298889bf1441d083)
Merge pull request #13887 from davidflanagan/bug939962

Bug 939962: attempt to reduce memory requirements for saving an edited i...(cherry picked from commit 08d96ee9678bef48a4540470ed96d32e962ff557)
Merge pull request #14474 from davidflanagan/bug939962-v1.2

Merge pull request #13887 from davidflanagan/bug939962
Merge pull request #14475 from davidflanagan/bug945376-v1.2

Bug 945376: correctly handle the None alert tone setting
Bug 945284 - Bump gaiatest version to 0.20. r=dhunt
Bug 937336 - Remove explicit frame switching from Homescreen/everything me app objects and tests
Bug 946482 - activitydone handler fine tune
Bug 946644 - Fix skip-if syntax issue for emulators. r=jgriffin
Bug 928968 - Add a command to the gaia command line tool to print the applications installed. r=zcampbell r=rwood
Merge pull request #14505 from AlinT/12bug_937336

Bug 937336 - Remove explicit frame switching from Homescreen/everything ...
Merge pull request #14464 from AndreiH/bug938061_v1.2

bug 938061 - final  - r=zac
Bug 948862 - [Contacts] The first time exporting a contact to SIM creates a duplicate of the contact in the contact list
Merge pull request #14568 from jmcanterafonseca/fix_dups_export_bug948862_v12

Bug 948862 - [Contacts] The first time exporting a contact to SIM create...
Bug 944276: MMS workaround for problem with memory-backed blobs

fix failing test and address review comments
Merge pull request #14547 from davidflanagan/bug946519-v1.2

Bug 944276: MMS workaround for problem with memory-backed blobs r=julienw
Merge pull request #14524 from alivedise/bugzilla/946482_v1.2/activity-chaining-done

Bug 946482 - activitydone handler fine tune, r=timdream
Merge pull request #14304 from RudyLu/keyboard/Bug930358-use_manifestURL_to_indentify_keyboardApp

Bug 930358 - Use manifestURL instead of app origin to identify a
r=gnarf, gary, arthur(cherry picked from commit 846b677b4975639dc61fce28e21d36d724f38160)
a=koi+

Conflicts:
	shared/resources/keyboard_layouts.json
Merge pull request #14488 from RudyLu/keyboard/Bug888253-keyboard_settings_migration

 Bug 888253 - Settings data migration for keyboard layouts.
r=gnarf, gary, yuren(cherry picked from commit 51ed5c6b6bda46284e797648b4b44dc9f804b14b)
a=koi+

Conflicts:
	build/settings.js
Bug 943317 - add a timer for expiring disableTap