Fixed keyboard events not firing
Consolidated keyboard events under one roof
Merge remote-tracking branch 'upstream/integration'
Merge pull request #15 from yandavid/master

Fixed keyboard events not firing