Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" into oc-dev