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

* commit '0237d1c966fec4ba0f48debde8606cdb1f48ee7f':