Merge "Return KeyEvent instead of initializing"