am 74f9eae8: am 2797dbd5: am 3a36cf75: Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev

* commit '74f9eae893f208979de29ac04e58e403386775f5':