Merge "Fix race condition when requestNetworkScan" into main