Merge "KeyEvent: update comment"