Bug 1009368 - Configure keyboard correctly
Merge pull request #19215 from alivedise/bugzilla/1009368_master/keyboard-settings

Bug 1009368 - Configure keyboard correctly, r=timdream