Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" into oc-dev am: 56879000d9
am: ea7fc08e0f

Change-Id: Iaf9a0298c0c1c8490c59de10015c0485d342ab25