Merge "Add log for new error string in WiFi QR code scanning" into main