Merge "Fix Monkey key events." into jb-dev