matter: Don't advertise when waiting for last fabric removed action

Close commissioning window on last fabric removal. It will be reopened
depending on `CHIP_LAST_FABRIC_REMOVED_ACTION`.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

samples/matter/common/src/app/fabric_table_delegate.h

@@ -42,7 +42,16 @@ class AppFabricTableDelegate : public chip::FabricTable::Delegate {
 	void OnFabricRemoved(const chip::FabricTable &fabricTable, chip::FabricIndex fabricIndex)
 	{
 #ifndef CONFIG_CHIP_LAST_FABRIC_REMOVED_NONE
-		k_timer_start(&sFabricRemovedTimer, K_MSEC(CONFIG_CHIP_LAST_FABRIC_REMOVED_ACTION_DELAY), K_NO_WAIT);
+		auto &server = chip::Server::GetInstance();
+
+		if (server.GetFabricTable().FabricCount() == 0) {
+			if (chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled()) {
+				server.GetCommissioningWindowManager().CloseCommissioningWindow();
+			}
+
+			k_timer_start(&sFabricRemovedTimer, K_MSEC(CONFIG_CHIP_LAST_FABRIC_REMOVED_ACTION_DELAY),
+				      K_NO_WAIT);
+		}
 #endif // CONFIG_CHIP_LAST_FABRIC_REMOVED_NONE
 	}