Merge change 24435 into eclair

* changes:
  Fix display strings and enter passkey handling.