Merge pull request #9073 from mcirlanaru/bug_828237

Bug 828237 - [Keyboard] Switch to new keyboard layout if language is cha... r=@davidflanagan(cherry picked from commit 74e31735fc78bf550db1f6e2f00ba5e907357180)
change initialization and settings update logic