Bug 906598 - Move Keyboard settings into app itself