Merge "Catch IllegalArgumentException on NetworkScan.stopScan"