Merge pull request #15892 from davidflanagan/bug959049v2

Merge pull request #15702 from davidflanagan/bug959049
Bug 956174: copy the settings panel from system keyboard