Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev