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