Merge "Fix WifiQrCode scheme inconsistency issue" into main