am 0035fadb: more hw keyboard fixes

* commit '0035fadb375ff0b549b84605eb9aea150d31677a':
  more hw keyboard fixes