Fix scenes cluster shutdown

Author: jadhavrohit924

src/app/clusters/scenes-server/scenes-server.cpp

@@ -1153,12 +1153,15 @@ void emberAfScenesManagementClusterServerInitCallback(EndpointId endpoint)
 
 void MatterScenesManagementClusterServerShutdownCallback(EndpointId endpoint)
 {
-    uint16_t endpointTableSize = 0;
-    VerifyOrReturn(Status::Success == Attributes::SceneTableSize::Get(endpoint, &endpointTableSize));
-
-    // Get Scene Table Instance
-    SceneTable * sceneTable = scenes::GetSceneTableImpl(endpoint, endpointTableSize);
-    sceneTable->RemoveEndpoint();
+    // TODO: Remove the commented code.
+    // MatterScenesManagementClusterServerShutdownCallback was not being called before and in the sceneTable->RemoveEndpoint();
+    // it removes the SceneTableEntry from the persistent storage.
+    // uint16_t endpointTableSize = 0;
+    // VerifyOrReturn(Status::Success == Attributes::SceneTableSize::Get(endpoint, &endpointTableSize));
+
+    // // Get Scene Table Instance
+    // SceneTable * sceneTable = scenes::GetSceneTableImpl(endpoint, endpointTableSize);
+    // sceneTable->RemoveEndpoint();
 }
 
 void MatterScenesManagementPluginServerInitCallback()

src/app/clusters/scenes-server/scenes-server.h

@@ -106,7 +106,11 @@ class ScenesServer : public CommandHandlerInterface, public AttributeAccessInter
 
 private:
     ScenesServer() : CommandHandlerInterface(Optional<EndpointId>(), Id), AttributeAccessInterface(Optional<EndpointId>(), Id) {}
-    ~ScenesServer() { Shutdown(); }
+    ~ScenesServer() {
+        // TODO: Remove the commented code.
+        // ScenesServer::Shutdown is being called from MatterScenesManagementPluginServerShutdownCallback.
+        // Shutdown();
+    }
 
     bool mIsInitialized = false;