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