Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" am: 36247646e3 am: 0f722b529c
am: ca8edea785

Change-Id: Ice647d05aff24a317862f54fb52ebccbeddd5e1a