Merge pull request #9689 from davidflanagan/bug828237

Bug 828237 - changing language should also switch default keyboard r=@davidflanagan,@RudyLu(cherry picked from commit a1cf4de967a4a8231c4dfd34d5da118047100b31)

Conflicts:

	apps/keyboard/js/keyboard.js
Merge pull request #9801 from davidflanagan/bug828237-v1-train

Merge pull request #9689 from davidflanagan/bug828237