Bug 812683 - Fix various crashes in Windows graphics libraries by blocking the ASUS Gamer OSD software, which is discontinued and unsupported. r=jrmuizel, a=lsblakk
Bug 871161 - Stop inheriting charset where other browsers do not inherit it. r=bzbarsky, a=lsblakk.
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/5b6b7b811174
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Revert "Uplift bug 912010, 928281 and 931977"

This reverts commit cce2ba1312b9a1fa534f446a46981d7ce6ee38fe, reversing
changes made to 90d2ede90cb19a7d1986950012b15c7024022205.
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/19d8ad4f4185
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #12016 from gasolin/issue-911668

Bug 911668 - [homescreen] change build-in apps orientation to default, r=timdream
(cherry picked from commit 18c2ab4b7b2d4cacee90fb85e97354142b2fad4a)
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/40bc580a6dad
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 912010 - [Keyboard][V1.2] Default Keyboard when all keyboards are de-selected - r=rlu r=garychen r=arthurcc

- Refactors `KeyboardHelper`
  - Renames the application method to `getApps`, which now caches response until the apps change
  - Adds a new API `getLayouts` to get a callback with an array of layouts.
  - Adds a new API `watchLayouts` to get a callback whenever layout settings or apps change
  - No longer calls `saveToSettings` itself when changing layout parameters.  This allows a consumer to batch operations before saving.
  - New method `checkDefaults` will make sure there is at least one `text` `url` and `number` keyboard enabled, calling the callback with anything it enabled.
  - +unit test suite.

- ManifestHelper now automatically returns a ManifestHelper for each object it contains
  - +unit test suite
  - now waits until access time to handle the language selection instead of creation time
     - this allows holding the one manifest helper and having its "name" property change with the language

- Settings Changes
  - Now uses `watchLayouts` from keyboard_helper
  - Now calls `checkDefaults` when disabling a keyboard
    - If a default is enabled opens a DefaultKeyboardEnabledDialog
  - Removed a bunch of commented out code for dealing with the old layout settings

- System Changes
  - Now uses `watchLayouts` from keyboard_helper
  - Will call `checkDefaults` whenever it can't find a keyboard to show, showing the default from `text` if it still can't find one

- Test suite
  - Moved some mocks to shared and updated require statements
  - Mock Settings now allows a "sync mode" that can call the callbacks for observers on demand.

Closes gh-12866
(cherry picked from commit ad0bf992cd379a32de18b9a4bb765757db8af986)

Conflicts:
	apps/homescreen/test/unit/homescreen_test.js
	apps/system/test/unit/homescreen_window_test.js
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/f13abd2e60c4
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #13115 from RudyLu/keyboard/Bug928281-keyboard_OOP

Bug 928281 - Run keyboard app Out-of-Process (OOP). r=timdream(cherry picked from commit 9c6586d85d4340600ace0aa69f5741c5f3f67970)

========

https://hg.mozilla.org/integration/gaia-1_2/rev/02b8e2fe6758
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #12213 from EragonJ/bug-911681

Bug 911681 - [FTU] replace tutorial images for large device(cherry picked from commit 754d45c663b96a3a9fb5c92b4aa91c2909717970)
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/b4573b810774
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 931977 - [Keyboard] Ensure first keyboard shown is properly initialized - r=rudyl

- use the `setKeyboardName` during first keyboard load
- Renabled TBPL test

Closes gh-13192
(cherry picked from commit b6221a5ecdeb1252c42f6a7b5628c90c1888346b)

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/ebcf7163c654
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #13255 from timdream/keyboard-perm-safenet

Bug 915570 - Rename 'keyboard' permission and role to 'input', r=rudyl
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/c9ef1a5b28ec
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Revert "Merge pull request #13115 from RudyLu/keyboard/Bug928281-keyboard_OOP"

This reverts commit 9e4c9a71c93620c6529a904ee16b745d570e4a9e.
Bug 920532 - Lots of "System JS : ERROR file:///builds/slave/test/build/b2g/components/MozKeyboard.js:380 TypeError: this._inputcontext is null" r=me, a=test-only
Bug 933226 - Less likely OOM when running browser_480148.js. r=mccr8, a=test-only
Bug 933072 - Make all Range tests only create 1 or 2 iframes instead of one or two per subtest. r=khuey, a=test-only
Merge m-b to b2g26. a=merge
Bug 879900 - Use moztest in Marionette, r=jgriffin, a=test-only
Bug 758835 - Add ability to mark tests as expected failures in the manifest, r=dburns, a=test-only
Bug 928842 - Fix xml-report generation, r=davehunt, a=test-only
Bug 927606 - Need to save the duration of individual test methods, r=mdas, a=test-only on a CLOSED TREE
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/c11b0154a68c
Author: rwood-moz <rwood@mozilla.com>
Desc: Update endurance tests datazilla submission script; a=test-only
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/477073e7942a
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Bug 933718 - Disable 2 tests so we can re-open mozilla-b2g26, a=test-only
Bug 915570 - Rename 'keyboard' permission and role to 'input'. r=yxl, a=koi+