am 52403d6f: Merge "Fix "Wrong password" message shown when using BT keyboard." into lmp-dev

* commit '52403d6f8e9a0e31a0f880a9cd297aeb35c29c8e':
  Fix "Wrong password" message shown when using BT keyboard.