Bug 946482 - activitydone handler fine tune
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