Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev

* changes:
  RESTRICT AUTOMERGE Update String
  RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message