Merge "Fix a tiny bug in NetworkScanRequest" into pi-dev