am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-dev

* commit '0632b35b6828cd4324b3d218c2e38f895e819aad':
  Improve handling of built-in keyboard.