* commit 'e10de072d50cbe6984151cbbdba4dd2f2e8310b9': (Do not merge) Backport a fix for InputMethodManager.java