Merge pull request #9868 from RudyLu/keyboard/catalan_support

Bug 866746 - Catalan keyboard layout r=RudyLu(cherry picked from commit 1419f08968e1a4b746579af39c9e2dbb44c0cf9d)

Conflicts:

	apps/settings/index.html
	shared/resources/keyboard_layouts.json

Merge pull request #9888 from gaye/bug-866746-followup

Bug 866746 - Fix lint errors introduced by 1419f0 r=RudyLu(cherry picked from commit 26701c886c262a40ffb9bcca3121204575baa922)

Conflicts:

	apps/keyboard/js/render.js

remove unused layout property
Merge pull request #11272 from davidflanagan/bug866746-v1-train

Bug866746 v1 train
Merge pull request #11231 from davidflanagan/bug896363

Bug 896363: Add an auto-correct dictionary for Catalan r=RudyLu(cherry picked from commit 247eec1e8cf4a5ccb4077ecc3e48dd3bda6ef108)

Conflicts:

	apps/keyboard/js/keyboard.js
Merge pull request #11273 from davidflanagan/bug896363-v1-train

Bug896363 v1 train
Merge pull request #11202 from davidflanagan/bug896907

Bug 896907: let the user preview a captured video before picking it r=daleharvey,johnhu(cherry picked from commit 862de8489b648a9af7e8a5b88be031b5479404ba)

Conflicts:

	apps/camera/js/camera.js
	apps/camera/style/filmstrip.css
Merge pull request #11278 from davidflanagan/bug896907-v1-train

Bug896907 v1 train