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

Change-Id: Iddd2b8eca58ae00c1c0b07c1be5280467955038d