Merge "avert 2500ms wait in InputMethodManager" into jb-mr1-dev