Keyboard/bug1013570 commit