Bug 925854 - Re-enable test_gallery_edit_photo
Merge pull request #13216 from soumyakanti/Bug_931379

Bug 931379 - Remove Pinyin (Simplified Chinese) selection from Developer... r=crh0716
(cherry picked from commit 7107b934993adc2894566ca11db956824b1c8031)
Merge pull request #13490 from eeejay/bug-936213

Bug 936213 - [homescreen] Remove aria-hidden attribute from dock pages.
(cherry picked from commit 4f06e34dee33d003bb47e625409fae89fc324dfb)
Merge pull request #13338 from evanxd/bug-925961

Bug 925961 - [B2G][Email] Receiver's email address displays as "null" after saving, editing, and then saving the draft again
(cherry picked from commit 37ad831cfde9e5b88f3e330e3a4e47b7df85b41c)
Merge pull request #13418 from timdream/keyboard-entry-point

Bug 930371 - Use "inputs" instead of "entry_points" in keyboard app manifest, r=rudyl
(cherry picked from commit 1e9aba68e8e6556d40ae2c414e9404047ec26bb8)
Merge pull request #13498 from timdream/keyboard-preload

Bug 936349 - Correct keyboard manager start-up, r=rudyl
(cherry picked from commit a44a4662c6314573dfe3d265f7ab8e3213279223)
Merge pull request #13480 from RudyLu/ftu/Bug913783-reset_keyboard_layouts

Bug 913783 - Enable language-associated keyboard layouts.
r=fcampo
(cherry picked from commit cc9fec48957c9d217221d403aac4b5f35a826dd6)
Merge pull request #11709 from timdream/jszhuyin-update

Bug 908577 - Update JSZhuyin to the latest version with glue code, r=rudyl
(cherry picked from commit 8f8de161501b016a44f5d787fff70071b060dc3a)
Bug 936350 - The keyboard management does not really handle OOM

(cherry picked from commit cded7ce967efbf3ebdffeb9ac066e26373bf5db9)
Bug 932795 - remove unused systemXHR permission. r=daleharvey

(cherry picked from commit 8179e273ebf9c1384f57a0813394bef294b51aad)
Bug 931229 - With kb set to Greek, move to email field, layout remains Greek and can't switch
Merge pull request #13599 from mpizza/Bug_931229_v1.2

Bug 931229 - With kb set to Greek, move to email field, layout remains G...
 (cherry picked from commit 7c1d94133d758af4a7b7534af435dcdcf131ab19)
Merge pull request #13342 from RudyLu/settings/Bug913784-language_keyboard_mapping

Bug 913784 - Language selection should also enable associated built-in
r=gnarf, arthur(cherry picked from commit 5cf3e2972c4d623ab0759ad85f6c4673ed9ed75f)

Conflicts:
	apps/settings/js/settings.js
	shared/resources/keyboard_layouts.json
Merge pull request #13588 from bebef1987/gallery

Bug 925854 - Re-enable test_gallery_edit_photo
Merge pull request #13504 from jaoo/927486

Bug 927486 - [Settings] Modify Message settings category. r=arthurcc(cherry picked from commit 49b3e8cc689e1c189a86e28c20bc4726d553ee03)

Conflicts:
	apps/settings/elements/carrier_mms_settings.html
	apps/settings/index.html