Merge pull request #18664 from timdream/keyboard-settings

Bug 988782 - Allow keyboard settings page manages it's own life, r=rudyl