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

* commit '3a36cf75590c4c4c134bbdd0688b33250af5a607':
  Dont hide the keyboard when showing alternates/ selecting a chip.