Merge "Fix to get KeyEvent information correctly" into devel/master