Merge "Protect Bluetooth device information when using NFC pairing" into qt-qpr1-dev