add ScanNetworks step to CHIPDeviceController

src/controller/CHIPDeviceController.cpp

@@ -1573,6 +1573,7 @@ void DeviceCommissioner::ResumeCommissioning()
     mDeviceBeingCommissioned = nullptr;
     CommissioningDelegate::CommissioningReport report;
 
+    mCommissioningPaused = false;
     if (mCommissioningDelegate == nullptr)
     {
         return;
@@ -1766,7 +1767,8 @@ void DeviceCommissioner::OnDone(app::ReadClient *)
                 {
                     if (features.Has(app::Clusters::NetworkCommissioning::NetworkCommissioningFeature::kWiFiNetworkInterface))
                     {
-                        ChipLogError(Controller, "----- NetworkCommissioning Features: has WiFi.");
+                        ChipLogError(Controller, "----- NetworkCommissioning Features: has WiFi. endpointid = %d",
+                                     path.mEndpointId);
                         info.network.wifi.endpoint = path.mEndpointId;
                     }
                     else if (features.Has(

src/controller/CommissioningDelegate.h

@@ -45,15 +45,15 @@ enum CommissioningStage : uint8_t
     kGenerateNOCChain,
     kSendTrustedRootCert,
     kSendNOC,
-    // ScanNetworks can happen anytime after kArmFailsafe
-    kScanNetworks,
     kWiFiNetworkSetup,
     kThreadNetworkSetup,
     kWiFiNetworkEnable,
     kThreadNetworkEnable,
     kFindOperational,
     kSendComplete,
     kCleanup,
+    // ScanNetworks can happen anytime after kArmFailsafe. Adding to the end to try to fix circ tests
+    kScanNetworks,
 };
 
 const char * StageToString(CommissioningStage stage);