am fae76f5b: Fix issue #1985502: Sapphire (and any other device) reports that it has a hard keyboard

Merge commit 'fae76f5bdeed68efd85805db143b0426de92f7e0'

* commit 'fae76f5bdeed68efd85805db143b0426de92f7e0':
  Fix issue #1985502: Sapphire (and any other device) reports that it has a hard keyboard