am 43bfed54: (-s ours) am c05362b8: am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls

* commit '43bfed5430f8c0b042ad229370a9d1fe95eb6156':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls