Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/571bf4395710
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #14524 from alivedise/bugzilla/946482_v1.2/activity-chaining-done

Bug 946482 - activitydone handler fine tune, r=timdream

========

https://hg.mozilla.org/integration/gaia-1_2/rev/9adda225ca26
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 946482 - activitydone handler fine tune
Backout b28014c2f203
backout eac3810f119c
Bug 943234 - Part 1: return mozContact in updateContact. r=vicamo. a=koi+
Bug 943234 - Part 2: update test cases. r=vicamo. a=koi+
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/ec65b935ae47
Author: Rudy Lu <me@rudy.lu>
Desc: 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
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/7d6e68e80014
Author: Rudy Lu <me@rudy.lu>
Desc: 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 941587 - Intermittent TEST-UNEXPECTED-FAIL | chrome://mochitests/content/browser/toolkit/components/satchel/test/browser/browser_privbrowsing_perwindowpb.js. r=ehsan, a=test-only
Bug 942229 - Intermittent browser_cmd_screenshot.js. r=jwalker, a=test-only
Bug 899910 - Intermittent TEST-UNEXPECTED-FAIL | layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xul. r=tn, a=test-only