am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling

* commit '558f41d4020a6714146dfd6f9508742c29ce9edd':
  [DO NOT MERGE] Activate hardware keyboard handling