diff --git a/src/android/CHIPTest/app/src/main/cpp/CHIPTest-JNI.cpp b/src/android/CHIPTest/app/src/main/cpp/CHIPTest-JNI.cpp
index 6aec9be75fa132..fbf88e673f8059 100644
--- a/src/android/CHIPTest/app/src/main/cpp/CHIPTest-JNI.cpp
+++ b/src/android/CHIPTest/app/src/main/cpp/CHIPTest-JNI.cpp
@@ -30,7 +30,6 @@
 #include <support/CHIPJNIError.h>
 #include <support/CodeUtils.h>
 #include <support/JniReferences.h>
-#include <support/StackLock.h>
 #include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
index 97b19156c2a0a8..3344fc7c5729b8 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.cpp
+++ b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -17,7 +17,6 @@
  */
 #include "AndroidDeviceControllerWrapper.h"
 #include <lib/support/CHIPJNIError.h>
-#include <lib/support/StackLock.h>
 
 #include <algorithm>
 #include <memory>
@@ -169,8 +168,7 @@ CHIP_ERROR AndroidDeviceControllerWrapper::GenerateNOCChain(const ByteSpan & csr
 }
 
 AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(JavaVM * vm, jobject deviceControllerObj,
-                                                                             pthread_mutex_t * stackLock, chip::NodeId nodeId,
-                                                                             chip::System::Layer * systemLayer,
+                                                                             chip::NodeId nodeId, chip::System::Layer * systemLayer,
                                                                              chip::Inet::InetLayer * inetLayer,
                                                                              CHIP_ERROR * errInfoOnFailure)
 {
@@ -201,7 +199,7 @@ AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(Jav
         *errInfoOnFailure = CHIP_ERROR_NO_MEMORY;
         return nullptr;
     }
-    std::unique_ptr<AndroidDeviceControllerWrapper> wrapper(new AndroidDeviceControllerWrapper(std::move(controller), stackLock));
+    std::unique_ptr<AndroidDeviceControllerWrapper> wrapper(new AndroidDeviceControllerWrapper(std::move(controller)));
 
     wrapper->SetJavaObjectRef(vm, deviceControllerObj);
 
@@ -274,25 +272,25 @@ AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(Jav
 
 void AndroidDeviceControllerWrapper::OnStatusUpdate(chip::Controller::DevicePairingDelegate::Status status)
 {
-    StackUnlockGuard unlockGuard(mStackLock);
+    chip::DeviceLayer::StackUnlock unlock;
     CallJavaMethod("onStatusUpdate", static_cast<jint>(status));
 }
 
 void AndroidDeviceControllerWrapper::OnPairingComplete(CHIP_ERROR error)
 {
-    StackUnlockGuard unlockGuard(mStackLock);
+    chip::DeviceLayer::StackUnlock unlock;
     CallJavaMethod("onPairingComplete", static_cast<jint>(error.AsInteger()));
 }
 
 void AndroidDeviceControllerWrapper::OnPairingDeleted(CHIP_ERROR error)
 {
-    StackUnlockGuard unlockGuard(mStackLock);
+    chip::DeviceLayer::StackUnlock unlock;
     CallJavaMethod("onPairingDeleted", static_cast<jint>(error.AsInteger()));
 }
 
 void AndroidDeviceControllerWrapper::OnCommissioningComplete(NodeId deviceId, CHIP_ERROR error)
 {
-    StackUnlockGuard unlockGuard(mStackLock);
+    chip::DeviceLayer::StackUnlock unlock;
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     jmethodID onCommissioningCompleteMethod;
     CHIP_ERROR err = JniReferences::GetInstance().FindMethod(env, mJavaObjectRef, "onCommissioningComplete", "(JI)V",
diff --git a/src/controller/java/AndroidDeviceControllerWrapper.h b/src/controller/java/AndroidDeviceControllerWrapper.h
index b31d945dc6f012..fc926e1d27e76a 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.h
+++ b/src/controller/java/AndroidDeviceControllerWrapper.h
@@ -83,9 +83,9 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel
         return reinterpret_cast<AndroidDeviceControllerWrapper *>(handle);
     }
 
-    static AndroidDeviceControllerWrapper * AllocateNew(JavaVM * vm, jobject deviceControllerObj, pthread_mutex_t * stackLock,
-                                                        chip::NodeId nodeId, chip::System::Layer * systemLayer,
-                                                        chip::Inet::InetLayer * inetLayer, CHIP_ERROR * errInfoOnFailure);
+    static AndroidDeviceControllerWrapper * AllocateNew(JavaVM * vm, jobject deviceControllerObj, chip::NodeId nodeId,
+                                                        chip::System::Layer * systemLayer, chip::Inet::InetLayer * inetLayer,
+                                                        CHIP_ERROR * errInfoOnFailure);
 
     CHIP_ERROR GenerateNOCChainAfterValidation(chip::NodeId nodeId, chip::FabricId fabricId,
                                                const chip::Crypto::P256PublicKey & ephemeralKey, chip::MutableByteSpan & rcac,
@@ -102,8 +102,6 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel
     ChipDeviceControllerPtr mController;
     chip::Controller::ExampleOperationalCredentialsIssuer mOpCredsIssuer;
 
-    pthread_mutex_t * mStackLock;
-
     JavaVM * mJavaVM       = nullptr;
     jobject mJavaObjectRef = nullptr;
 
@@ -113,8 +111,7 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel
     chip::FabricId mNextFabricId      = 0;
     bool mNodeIdRequested             = false;
 
-    AndroidDeviceControllerWrapper(ChipDeviceControllerPtr controller, pthread_mutex_t * stackLock) :
-        mController(std::move(controller)), mStackLock(stackLock)
+    AndroidDeviceControllerWrapper(ChipDeviceControllerPtr controller) : mController(std::move(controller))
     {
         chip::CalendarToChipEpochTime(2021, 06, 10, 0, 0, 0, mNow);
     }
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
index dd515f2101de49..f3b5873fef6e61 100644
--- a/src/controller/java/CHIPDeviceController-JNI.cpp
+++ b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -26,7 +26,6 @@
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
-#include <lib/support/StackLock.h>
 
 #include <app/chip-zcl-zpro-codec.h>
 #include <atomic>
@@ -113,7 +112,7 @@ jint JNI_OnLoad(JavaVM * jvm, void * reserved)
     if (err != CHIP_NO_ERROR)
     {
         ThrowError(env, err);
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         JNI_OnUnload(jvm, reserved);
     }
 
@@ -122,7 +121,7 @@ jint JNI_OnLoad(JavaVM * jvm, void * reserved)
 
 void JNI_OnUnload(JavaVM * jvm, void * reserved)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ChipLogProgress(Controller, "JNI_OnUnload() called");
 
     // If the IO thread has been started, shut it down and wait for it to exit.
@@ -130,7 +129,7 @@ void JNI_OnUnload(JavaVM * jvm, void * reserved)
     {
         chip::DeviceLayer::PlatformMgr().StopEventLoopTask();
 
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         pthread_join(sIOThread, NULL);
     }
 
@@ -141,7 +140,7 @@ void JNI_OnUnload(JavaVM * jvm, void * reserved)
 
 JNI_METHOD(jlong, newDeviceController)(JNIEnv * env, jobject self)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err                           = CHIP_NO_ERROR;
     AndroidDeviceControllerWrapper * wrapper = NULL;
     long result                              = 0;
@@ -152,8 +151,8 @@ JNI_METHOD(jlong, newDeviceController)(JNIEnv * env, jobject self)
     err = DeviceLayer::PlatformMgr().InitChipStack();
     SuccessOrExit(err);
 
-    wrapper = AndroidDeviceControllerWrapper::AllocateNew(sJVM, self, JniReferences::GetInstance().GetStackLock(), kLocalDeviceId,
-                                                          &DeviceLayer::SystemLayer(), &DeviceLayer::InetLayer, &err);
+    wrapper = AndroidDeviceControllerWrapper::AllocateNew(sJVM, self, kLocalDeviceId, &DeviceLayer::SystemLayer(),
+                                                          &DeviceLayer::InetLayer, &err);
     SuccessOrExit(err);
 
     // Create and start the IO thread. Must be called after Controller()->Init
@@ -185,7 +184,7 @@ JNI_METHOD(jlong, newDeviceController)(JNIEnv * env, jobject self)
 JNI_METHOD(void, pairDevice)
 (JNIEnv * env, jobject self, jlong handle, jlong deviceId, jint connObj, jlong pinCode, jbyteArray csrNonce)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err                           = CHIP_NO_ERROR;
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
 
@@ -213,7 +212,7 @@ JNI_METHOD(void, pairDeviceWithAddress)
 (JNIEnv * env, jobject self, jlong handle, jlong deviceId, jstring address, jint port, jint discriminator, jint pinCode,
  jbyteArray csrNonce)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err                           = CHIP_NO_ERROR;
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
 
@@ -244,7 +243,7 @@ JNI_METHOD(void, pairDeviceWithAddress)
 
 JNI_METHOD(void, unpairDevice)(JNIEnv * env, jobject self, jlong handle, jlong deviceId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err                           = CHIP_NO_ERROR;
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
 
@@ -261,7 +260,7 @@ JNI_METHOD(void, unpairDevice)(JNIEnv * env, jobject self, jlong handle, jlong d
 
 JNI_METHOD(void, stopDevicePairing)(JNIEnv * env, jobject self, jlong handle, jlong deviceId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err                           = CHIP_NO_ERROR;
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
 
@@ -278,7 +277,7 @@ JNI_METHOD(void, stopDevicePairing)(JNIEnv * env, jobject self, jlong handle, jl
 
 JNI_METHOD(jlong, getDevicePointer)(JNIEnv * env, jobject self, jlong handle, jlong deviceId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     Device * chipDevice = nullptr;
 
     ChipLogProgress(Controller, "getDevicePointer() called with device ID");
@@ -291,7 +290,7 @@ JNI_METHOD(jlong, getDevicePointer)(JNIEnv * env, jobject self, jlong handle, jl
 
 JNI_METHOD(void, getConnectedDevicePointer)(JNIEnv * env, jobject self, jlong handle, jlong nodeId, jlong callbackHandle)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
 
     GetConnectedDeviceCallback * connectedDeviceCallback = reinterpret_cast<GetConnectedDeviceCallback *>(callbackHandle);
@@ -301,7 +300,7 @@ JNI_METHOD(void, getConnectedDevicePointer)(JNIEnv * env, jobject self, jlong ha
 
 JNI_METHOD(void, pairTestDeviceWithoutSecurity)(JNIEnv * env, jobject self, jlong handle, jstring deviceAddr)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err                           = CHIP_NO_ERROR;
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
     chip::Inet::IPAddress deviceIPAddr;
@@ -325,7 +324,7 @@ JNI_METHOD(void, pairTestDeviceWithoutSecurity)(JNIEnv * env, jobject self, jlon
 
 JNI_METHOD(void, disconnectDevice)(JNIEnv * env, jobject self, jlong handle, jlong deviceId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
     CHIP_ERROR err                           = CHIP_NO_ERROR;
     Device * chipDevice                      = nullptr;
@@ -345,7 +344,7 @@ JNI_METHOD(void, disconnectDevice)(JNIEnv * env, jobject self, jlong handle, jlo
 
 JNI_METHOD(jboolean, isActive)(JNIEnv * env, jobject self, jlong handle)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
 
     Device * chipDevice = reinterpret_cast<Device *>(handle);
     return chipDevice->IsActive();
@@ -367,7 +366,7 @@ void GetCHIPDevice(JNIEnv * env, long wrapperHandle, uint64_t deviceId, Device *
 
 JNI_METHOD(jstring, getIpAddress)(JNIEnv * env, jobject self, jlong handle, jlong deviceId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     Device * chipDevice = nullptr;
 
     GetCHIPDevice(env, handle, deviceId, &chipDevice);
@@ -385,7 +384,7 @@ JNI_METHOD(jstring, getIpAddress)(JNIEnv * env, jobject self, jlong handle, jlon
 
 JNI_METHOD(void, updateDevice)(JNIEnv * env, jobject self, jlong handle, jlong fabricId, jlong deviceId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
 
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
 
@@ -399,7 +398,7 @@ JNI_METHOD(void, updateDevice)(JNIEnv * env, jobject self, jlong handle, jlong f
 
 JNI_METHOD(jboolean, openPairingWindow)(JNIEnv * env, jobject self, jlong handle, jlong deviceId, jint duration)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err      = CHIP_NO_ERROR;
     Device * chipDevice = nullptr;
     chip::SetupPayload setupPayload;
@@ -421,7 +420,7 @@ JNI_METHOD(jboolean, openPairingWindow)(JNIEnv * env, jobject self, jlong handle
 JNI_METHOD(jboolean, openPairingWindowWithPIN)
 (JNIEnv * env, jobject self, jlong handle, jlong deviceId, jint duration, jint iteration, jint discriminator, jlong setupPinCode)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err      = CHIP_NO_ERROR;
     Device * chipDevice = nullptr;
     chip::SetupPayload setupPayload;
@@ -444,7 +443,7 @@ JNI_METHOD(jboolean, openPairingWindowWithPIN)
 
 JNI_METHOD(void, deleteDeviceController)(JNIEnv * env, jobject self, jlong handle)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
 
     ChipLogProgress(Controller, "deleteDeviceController() called");
diff --git a/src/controller/java/templates/CHIPClusters-JNI.zapt b/src/controller/java/templates/CHIPClusters-JNI.zapt
index ac5618eff4d60f..51629573cf39d8 100644
--- a/src/controller/java/templates/CHIPClusters-JNI.zapt
+++ b/src/controller/java/templates/CHIPClusters-JNI.zapt
@@ -7,11 +7,11 @@
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
-#include <lib/support/StackLock.h>
 #include <jni.h>
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/Span.h>
+#include <platform/PlatformManager.h>
 
 #define JNI_METHOD(RETURN, CLASS_NAME, METHOD_NAME)                                                                                            \
     extern "C" JNIEXPORT RETURN JNICALL Java_chip_devicecontroller_ChipClusters_00024##CLASS_NAME##_##METHOD_NAME
@@ -111,7 +111,7 @@ class CHIPDefaultSuccessCallback : public Callback::Callback<DefaultSuccessCallb
 
         static void CallbackFn(void * context)
         {
-            StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+            chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
             jmethodID javaMethod;
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -174,7 +174,7 @@ class CHIPDefaultFailureCallback : public Callback::Callback<DefaultFailureCallb
 
         static void CallbackFn(void * context, uint8_t status)
         {
-            StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+            chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
             jmethodID javaMethod;
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -240,7 +240,7 @@ class CHIP{{chipCallback.name}}AttributeCallback : public Callback::Callback<{{c
 
         static void CallbackFn(void * context, {{chipCallback.type}} value)
         {
-            StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+            chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
 
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -317,7 +317,7 @@ class CHIP{{asUpperCamelCase parent.name}}Cluster{{asUpperCamelCase name}}Callba
 
         static void CallbackFn(void * context{{#chip_cluster_response_arguments}}, {{asUnderlyingZclType type}} {{asSymbol label}}{{/chip_cluster_response_arguments}})
         {
-            StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+            chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             jobject javaCallbackRef;
@@ -413,7 +413,7 @@ class CHIP{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}AttributeCall
 
         static void CallbackFn(void * context, uint16_t count, {{chipType}} * entries)
         {
-            StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+            chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             jobject javaCallbackRef;
@@ -502,7 +502,7 @@ class CHIP{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}AttributeCall
 
 JNI_METHOD(void, BaseChipCluster, deleteCluster)(JNIEnv * env, jobject self, jlong clusterPtr)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ClusterBase * cluster = reinterpret_cast<ClusterBase *>(clusterPtr);
     if (cluster != nullptr) {
         delete cluster;
@@ -512,7 +512,7 @@ JNI_METHOD(void, BaseChipCluster, deleteCluster)(JNIEnv * env, jobject self, jlo
 {{#chip_client_clusters}}
 JNI_METHOD(jlong, {{asUpperCamelCase name}}Cluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     {{asUpperCamelCase name}}Cluster * cppCluster = new {{asUpperCamelCase name}}Cluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -526,7 +526,7 @@ JNI_METHOD(void, {{asUpperCamelCase ../name}}Cluster, {{asLowerCamelCase name}})
 JNI_METHOD(void, {{asUpperCamelCase ../name}}Cluster, {{asLowerCamelCase name}})(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {{/if}}
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     {{asUpperCamelCase ../name}}Cluster * cppCluster;
     
@@ -586,7 +586,7 @@ exit:
 
 JNI_METHOD(void, {{asUpperCamelCase ../name}}Cluster, read{{asUpperCamelCase name}}Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
 {{#if isList}}
     CHIP{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}AttributeCallback * onSuccess = new CHIP{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}AttributeCallback(callback);
 {{else}}
@@ -624,7 +624,7 @@ JNI_METHOD(void, {{asUpperCamelCase ../name}}Cluster, read{{asUpperCamelCase nam
 
 JNI_METHOD(void, {{asUpperCamelCase ../name}}Cluster, write{{asUpperCamelCase name}}Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, {{asJniBasicType type}} value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess) {
         ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY.AsInteger());
diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
index f70f2dd17edd06..2d1bc7d0974495 100644
--- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
@@ -27,7 +27,7 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 #include <lib/support/Span.h>
-#include <lib/support/StackLock.h>
+#include <platform/PlatformManager.h>
 
 #define JNI_METHOD(RETURN, CLASS_NAME, METHOD_NAME)                                                                                \
     extern "C" JNIEXPORT RETURN JNICALL Java_chip_devicecontroller_ChipClusters_00024##CLASS_NAME##_##METHOD_NAME
@@ -136,7 +136,7 @@ class CHIPDefaultSuccessCallback : public Callback::Callback<DefaultSuccessCallb
 
     static void CallbackFn(void * context)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         jmethodID javaMethod;
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -205,7 +205,7 @@ class CHIPDefaultFailureCallback : public Callback::Callback<DefaultFailureCallb
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         jmethodID javaMethod;
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -276,7 +276,7 @@ class CHIPBooleanAttributeCallback : public Callback::Callback<BooleanAttributeC
 
     static void CallbackFn(void * context, bool value)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -331,7 +331,7 @@ class CHIPCharStringAttributeCallback : public Callback::Callback<CharStringAttr
 
     static void CallbackFn(void * context, const chip::ByteSpan value)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -389,7 +389,7 @@ class CHIPInt8sAttributeCallback : public Callback::Callback<Int8sAttributeCallb
 
     static void CallbackFn(void * context, int8_t value)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -444,7 +444,7 @@ class CHIPInt8uAttributeCallback : public Callback::Callback<Int8uAttributeCallb
 
     static void CallbackFn(void * context, uint8_t value)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -499,7 +499,7 @@ class CHIPInt16sAttributeCallback : public Callback::Callback<Int16sAttributeCal
 
     static void CallbackFn(void * context, int16_t value)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -554,7 +554,7 @@ class CHIPInt16uAttributeCallback : public Callback::Callback<Int16uAttributeCal
 
     static void CallbackFn(void * context, uint16_t value)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -609,7 +609,7 @@ class CHIPInt32sAttributeCallback : public Callback::Callback<Int32sAttributeCal
 
     static void CallbackFn(void * context, int32_t value)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -664,7 +664,7 @@ class CHIPInt32uAttributeCallback : public Callback::Callback<Int32uAttributeCal
 
     static void CallbackFn(void * context, uint32_t value)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -719,7 +719,7 @@ class CHIPInt64sAttributeCallback : public Callback::Callback<Int64sAttributeCal
 
     static void CallbackFn(void * context, int64_t value)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -774,7 +774,7 @@ class CHIPInt64uAttributeCallback : public Callback::Callback<Int64uAttributeCal
 
     static void CallbackFn(void * context, uint64_t value)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -829,7 +829,7 @@ class CHIPOctetStringAttributeCallback : public Callback::Callback<OctetStringAt
 
     static void CallbackFn(void * context, const chip::ByteSpan value)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
 
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -892,7 +892,7 @@ class CHIPAccountLoginClusterGetSetupPINResponseCallback : public Callback::Call
 
     static void CallbackFn(void * context, uint8_t * setupPIN)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -963,7 +963,7 @@ class CHIPApplicationLauncherClusterLaunchAppResponseCallback
 
     static void CallbackFn(void * context, uint8_t status, uint8_t * data)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1034,7 +1034,7 @@ class CHIPContentLauncherClusterLaunchContentResponseCallback
 
     static void CallbackFn(void * context, uint8_t * data, uint8_t contentLaunchStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1105,7 +1105,7 @@ class CHIPContentLauncherClusterLaunchURLResponseCallback
 
     static void CallbackFn(void * context, uint8_t * data, uint8_t contentLaunchStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1175,7 +1175,7 @@ class CHIPDoorLockClusterClearAllPinsResponseCallback : public Callback::Callbac
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1243,7 +1243,7 @@ class CHIPDoorLockClusterClearAllRfidsResponseCallback : public Callback::Callba
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1312,7 +1312,7 @@ class CHIPDoorLockClusterClearHolidayScheduleResponseCallback
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1380,7 +1380,7 @@ class CHIPDoorLockClusterClearPinResponseCallback : public Callback::Callback<Do
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1448,7 +1448,7 @@ class CHIPDoorLockClusterClearRfidResponseCallback : public Callback::Callback<D
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1517,7 +1517,7 @@ class CHIPDoorLockClusterClearWeekdayScheduleResponseCallback
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1586,7 +1586,7 @@ class CHIPDoorLockClusterClearYeardayScheduleResponseCallback
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1656,7 +1656,7 @@ class CHIPDoorLockClusterGetHolidayScheduleResponseCallback
     static void CallbackFn(void * context, uint8_t scheduleId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime,
                            uint8_t operatingModeDuringHoliday)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1727,7 +1727,7 @@ class CHIPDoorLockClusterGetLogRecordResponseCallback : public Callback::Callbac
     static void CallbackFn(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source,
                            uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1800,7 +1800,7 @@ class CHIPDoorLockClusterGetPinResponseCallback : public Callback::Callback<Door
 
     static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1871,7 +1871,7 @@ class CHIPDoorLockClusterGetRfidResponseCallback : public Callback::Callback<Doo
 
     static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -1942,7 +1942,7 @@ class CHIPDoorLockClusterGetUserTypeResponseCallback : public Callback::Callback
 
     static void CallbackFn(void * context, uint16_t userId, uint8_t userType)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2012,7 +2012,7 @@ class CHIPDoorLockClusterGetWeekdayScheduleResponseCallback
     static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour,
                            uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2084,7 +2084,7 @@ class CHIPDoorLockClusterGetYeardayScheduleResponseCallback
     static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t status, uint32_t localStartTime,
                            uint32_t localEndTime)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2153,7 +2153,7 @@ class CHIPDoorLockClusterLockDoorResponseCallback : public Callback::Callback<Do
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2222,7 +2222,7 @@ class CHIPDoorLockClusterSetHolidayScheduleResponseCallback
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2290,7 +2290,7 @@ class CHIPDoorLockClusterSetPinResponseCallback : public Callback::Callback<Door
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2358,7 +2358,7 @@ class CHIPDoorLockClusterSetRfidResponseCallback : public Callback::Callback<Doo
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2426,7 +2426,7 @@ class CHIPDoorLockClusterSetUserTypeResponseCallback : public Callback::Callback
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2495,7 +2495,7 @@ class CHIPDoorLockClusterSetWeekdayScheduleResponseCallback
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2564,7 +2564,7 @@ class CHIPDoorLockClusterSetYeardayScheduleResponseCallback
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2632,7 +2632,7 @@ class CHIPDoorLockClusterUnlockDoorResponseCallback : public Callback::Callback<
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2701,7 +2701,7 @@ class CHIPDoorLockClusterUnlockWithTimeoutResponseCallback
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2770,7 +2770,7 @@ class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2841,7 +2841,7 @@ class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2912,7 +2912,7 @@ class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -2982,7 +2982,7 @@ class CHIPGroupsClusterAddGroupResponseCallback : public Callback::Callback<Grou
 
     static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3052,7 +3052,7 @@ class CHIPGroupsClusterGetGroupMembershipResponseCallback
     static void CallbackFn(void * context, uint8_t capacity, uint8_t groupCount,
                            /* TYPE WARNING: array array defaults to */ uint8_t * groupList)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3123,7 +3123,7 @@ class CHIPGroupsClusterRemoveGroupResponseCallback : public Callback::Callback<G
 
     static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3191,7 +3191,7 @@ class CHIPGroupsClusterViewGroupResponseCallback : public Callback::Callback<Gro
 
     static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t * groupName)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3262,7 +3262,7 @@ class CHIPIdentifyClusterIdentifyQueryResponseCallback : public Callback::Callba
 
     static void CallbackFn(void * context, uint16_t timeout)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3330,7 +3330,7 @@ class CHIPKeypadInputClusterSendKeyResponseCallback : public Callback::Callback<
 
     static void CallbackFn(void * context, uint8_t status)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3399,7 +3399,7 @@ class CHIPMediaPlaybackClusterMediaFastForwardResponseCallback
 
     static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3467,7 +3467,7 @@ class CHIPMediaPlaybackClusterMediaNextResponseCallback : public Callback::Callb
 
     static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3535,7 +3535,7 @@ class CHIPMediaPlaybackClusterMediaPauseResponseCallback : public Callback::Call
 
     static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3603,7 +3603,7 @@ class CHIPMediaPlaybackClusterMediaPlayResponseCallback : public Callback::Callb
 
     static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3672,7 +3672,7 @@ class CHIPMediaPlaybackClusterMediaPreviousResponseCallback
 
     static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3741,7 +3741,7 @@ class CHIPMediaPlaybackClusterMediaRewindResponseCallback
 
     static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3809,7 +3809,7 @@ class CHIPMediaPlaybackClusterMediaSeekResponseCallback : public Callback::Callb
 
     static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3878,7 +3878,7 @@ class CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback
 
     static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -3947,7 +3947,7 @@ class CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback
 
     static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4016,7 +4016,7 @@ class CHIPMediaPlaybackClusterMediaStartOverResponseCallback
 
     static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4084,7 +4084,7 @@ class CHIPMediaPlaybackClusterMediaStopResponseCallback : public Callback::Callb
 
     static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4153,7 +4153,7 @@ class CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4224,7 +4224,7 @@ class CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4295,7 +4295,7 @@ class CHIPNetworkCommissioningClusterDisableNetworkResponseCallback
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4366,7 +4366,7 @@ class CHIPNetworkCommissioningClusterEnableNetworkResponseCallback
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4437,7 +4437,7 @@ class CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4510,7 +4510,7 @@ class CHIPNetworkCommissioningClusterScanNetworksResponseCallback
                            /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults,
                            /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4586,7 +4586,7 @@ class CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4657,7 +4657,7 @@ class CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4728,7 +4728,7 @@ class CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback
 
     static void CallbackFn(void * context, uint8_t action, uint32_t delayedActionTime)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4799,7 +4799,7 @@ class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback
                            uint8_t * softwareVersionString, chip::ByteSpan updateToken, bool userConsentNeeded,
                            chip::ByteSpan metadataForRequestor)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4892,7 +4892,7 @@ class CHIPOperationalCredentialsClusterAttestationResponseCallback
 
     static void CallbackFn(void * context, chip::ByteSpan AttestationElements, chip::ByteSpan Signature)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -4978,7 +4978,7 @@ class CHIPOperationalCredentialsClusterCertificateChainResponseCallback
 
     static void CallbackFn(void * context, chip::ByteSpan Certificate)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5056,7 +5056,7 @@ class CHIPOperationalCredentialsClusterNOCResponseCallback
 
     static void CallbackFn(void * context, uint8_t StatusCode, uint8_t FabricIndex, chip::ByteSpan DebugText)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5135,7 +5135,7 @@ class CHIPOperationalCredentialsClusterOpCSRResponseCallback
 
     static void CallbackFn(void * context, chip::ByteSpan NOCSRElements, chip::ByteSpan AttestationSignature)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5220,7 +5220,7 @@ class CHIPScenesClusterAddSceneResponseCallback : public Callback::Callback<Scen
 
     static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5291,7 +5291,7 @@ class CHIPScenesClusterGetSceneMembershipResponseCallback
     static void CallbackFn(void * context, uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
                            /* TYPE WARNING: array array defaults to */ uint8_t * sceneList)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5363,7 +5363,7 @@ class CHIPScenesClusterRemoveAllScenesResponseCallback : public Callback::Callba
 
     static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5431,7 +5431,7 @@ class CHIPScenesClusterRemoveSceneResponseCallback : public Callback::Callback<S
 
     static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5500,7 +5500,7 @@ class CHIPScenesClusterStoreSceneResponseCallback : public Callback::Callback<Sc
 
     static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5570,7 +5570,7 @@ class CHIPScenesClusterViewSceneResponseCallback : public Callback::Callback<Sce
     static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
                            uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5644,7 +5644,7 @@ class CHIPTvChannelClusterChangeChannelResponseCallback : public Callback::Callb
 
     static void CallbackFn(void * context, /* TYPE WARNING: array array defaults to */ uint8_t * ChannelMatch, uint8_t ErrorType)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5718,7 +5718,7 @@ class CHIPTargetNavigatorClusterNavigateTargetResponseCallback
 
     static void CallbackFn(void * context, uint8_t status, uint8_t * data)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5789,7 +5789,7 @@ class CHIPTestClusterClusterTestAddArgumentsResponseCallback
 
     static void CallbackFn(void * context, uint8_t returnValue)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5857,7 +5857,7 @@ class CHIPTestClusterClusterTestSpecificResponseCallback : public Callback::Call
 
     static void CallbackFn(void * context, uint8_t returnValue)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5916,7 +5916,7 @@ class CHIPApplicationLauncherApplicationLauncherListAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, uint16_t * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -5985,7 +5985,7 @@ class CHIPAudioOutputAudioOutputListAttributeCallback : public Callback::Callbac
 
     static void CallbackFn(void * context, uint16_t count, _AudioOutputInfo * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6070,7 +6070,7 @@ class CHIPContentLauncherAcceptsHeaderListAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, chip::ByteSpan * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6138,7 +6138,7 @@ class CHIPContentLauncherSupportedStreamingTypesAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6207,7 +6207,7 @@ class CHIPDescriptorDeviceListAttributeCallback : public Callback::Callback<Desc
 
     static void CallbackFn(void * context, uint16_t count, _DeviceType * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6288,7 +6288,7 @@ class CHIPDescriptorServerListAttributeCallback : public Callback::Callback<Desc
 
     static void CallbackFn(void * context, uint16_t count, chip::ClusterId * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6357,7 +6357,7 @@ class CHIPDescriptorClientListAttributeCallback : public Callback::Callback<Desc
 
     static void CallbackFn(void * context, uint16_t count, chip::ClusterId * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6426,7 +6426,7 @@ class CHIPDescriptorPartsListAttributeCallback : public Callback::Callback<Descr
 
     static void CallbackFn(void * context, uint16_t count, chip::EndpointId * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6495,7 +6495,7 @@ class CHIPFixedLabelLabelListAttributeCallback : public Callback::Callback<Fixed
 
     static void CallbackFn(void * context, uint16_t count, _LabelStruct * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6579,7 +6579,7 @@ class CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, _BasicCommissioningInfoType * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6665,7 +6665,7 @@ class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, _NetworkInterfaceType * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6757,7 +6757,7 @@ class CHIPGroupKeyManagementGroupsAttributeCallback : public Callback::Callback<
 
     static void CallbackFn(void * context, uint16_t count, _GroupState * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6839,7 +6839,7 @@ class CHIPGroupKeyManagementGroupKeysAttributeCallback : public Callback::Callba
 
     static void CallbackFn(void * context, uint16_t count, _GroupKey * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -6927,7 +6927,7 @@ class CHIPMediaInputMediaInputListAttributeCallback : public Callback::Callback<
 
     static void CallbackFn(void * context, uint16_t count, _MediaInputInfo * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7014,7 +7014,7 @@ class CHIPOperationalCredentialsFabricsListAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, _FabricDescriptor * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7105,7 +7105,7 @@ class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7174,7 +7174,7 @@ class CHIPTvChannelTvChannelListAttributeCallback : public Callback::Callback<Tv
 
     static void CallbackFn(void * context, uint16_t count, _TvChannelInfo * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7265,7 +7265,7 @@ class CHIPTargetNavigatorTargetNavigatorListAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, _NavigateTargetTargetInfo * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7349,7 +7349,7 @@ class CHIPTestClusterListInt8uAttributeCallback : public Callback::Callback<Test
 
     static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7418,7 +7418,7 @@ class CHIPTestClusterListOctetStringAttributeCallback : public Callback::Callbac
 
     static void CallbackFn(void * context, uint16_t count, chip::ByteSpan * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7486,7 +7486,7 @@ class CHIPTestClusterListStructOctetStringAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, _TestListStructOctet * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7571,7 +7571,7 @@ class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, _NeighborTable * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7669,7 +7669,7 @@ class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, _RouteTable * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7762,7 +7762,7 @@ class CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, _SecurityPolicy * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7846,7 +7846,7 @@ class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, _OperationalDatasetComponents * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7947,7 +7947,7 @@ class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback
 
     static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
     {
-        StackUnlockGuard unlockGuard(JniReferences::GetInstance().GetStackLock());
+        chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
@@ -7996,7 +7996,7 @@ class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback
 
 JNI_METHOD(void, BaseChipCluster, deleteCluster)(JNIEnv * env, jobject self, jlong clusterPtr)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ClusterBase * cluster = reinterpret_cast<ClusterBase *>(clusterPtr);
     if (cluster != nullptr)
     {
@@ -8006,7 +8006,7 @@ JNI_METHOD(void, BaseChipCluster, deleteCluster)(JNIEnv * env, jobject self, jlo
 
 JNI_METHOD(jlong, AccountLoginCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     AccountLoginCluster * cppCluster = new AccountLoginCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -8016,7 +8016,7 @@ JNI_METHOD(jlong, AccountLoginCluster, initWithDevice)(JNIEnv * env, jobject sel
 JNI_METHOD(void, AccountLoginCluster, getSetupPIN)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AccountLoginCluster * cppCluster;
 
@@ -8065,7 +8065,7 @@ JNI_METHOD(void, AccountLoginCluster, getSetupPIN)
 JNI_METHOD(void, AccountLoginCluster, login)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier, jstring setupPIN)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AccountLoginCluster * cppCluster;
 
@@ -8115,7 +8115,7 @@ JNI_METHOD(void, AccountLoginCluster, login)
 
 JNI_METHOD(void, AccountLoginCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8151,7 +8151,7 @@ JNI_METHOD(void, AccountLoginCluster, readClusterRevisionAttribute)(JNIEnv * env
 }
 JNI_METHOD(jlong, AdministratorCommissioningCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     AdministratorCommissioningCluster * cppCluster = new AdministratorCommissioningCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -8161,7 +8161,7 @@ JNI_METHOD(jlong, AdministratorCommissioningCluster, initWithDevice)(JNIEnv * en
 JNI_METHOD(void, AdministratorCommissioningCluster, openBasicCommissioningWindow)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint commissioningTimeout)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AdministratorCommissioningCluster * cppCluster;
 
@@ -8208,7 +8208,7 @@ JNI_METHOD(void, AdministratorCommissioningCluster, openCommissioningWindow)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint commissioningTimeout, jbyteArray pAKEVerifier,
  jint discriminator, jlong iterations, jbyteArray salt, jint passcodeID)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AdministratorCommissioningCluster * cppCluster;
 
@@ -8259,7 +8259,7 @@ JNI_METHOD(void, AdministratorCommissioningCluster, openCommissioningWindow)
 JNI_METHOD(void, AdministratorCommissioningCluster, revokeCommissioning)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AdministratorCommissioningCluster * cppCluster;
 
@@ -8306,7 +8306,7 @@ JNI_METHOD(void, AdministratorCommissioningCluster, revokeCommissioning)
 JNI_METHOD(void, AdministratorCommissioningCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8342,7 +8342,7 @@ JNI_METHOD(void, AdministratorCommissioningCluster, readClusterRevisionAttribute
 }
 JNI_METHOD(jlong, ApplicationBasicCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ApplicationBasicCluster * cppCluster = new ApplicationBasicCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -8351,7 +8351,7 @@ JNI_METHOD(jlong, ApplicationBasicCluster, initWithDevice)(JNIEnv * env, jobject
 
 JNI_METHOD(void, ApplicationBasicCluster, changeStatus)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint status)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster;
 
@@ -8397,7 +8397,7 @@ JNI_METHOD(void, ApplicationBasicCluster, changeStatus)(JNIEnv * env, jobject se
 
 JNI_METHOD(void, ApplicationBasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8434,7 +8434,7 @@ JNI_METHOD(void, ApplicationBasicCluster, readVendorNameAttribute)(JNIEnv * env,
 
 JNI_METHOD(void, ApplicationBasicCluster, readVendorIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8472,7 +8472,7 @@ JNI_METHOD(void, ApplicationBasicCluster, readVendorIdAttribute)(JNIEnv * env, j
 JNI_METHOD(void, ApplicationBasicCluster, readApplicationNameAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8509,7 +8509,7 @@ JNI_METHOD(void, ApplicationBasicCluster, readApplicationNameAttribute)
 
 JNI_METHOD(void, ApplicationBasicCluster, readProductIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8547,7 +8547,7 @@ JNI_METHOD(void, ApplicationBasicCluster, readProductIdAttribute)(JNIEnv * env,
 JNI_METHOD(void, ApplicationBasicCluster, readApplicationIdAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8585,7 +8585,7 @@ JNI_METHOD(void, ApplicationBasicCluster, readApplicationIdAttribute)
 JNI_METHOD(void, ApplicationBasicCluster, readCatalogVendorIdAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8623,7 +8623,7 @@ JNI_METHOD(void, ApplicationBasicCluster, readCatalogVendorIdAttribute)
 JNI_METHOD(void, ApplicationBasicCluster, readApplicationStatusAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8661,7 +8661,7 @@ JNI_METHOD(void, ApplicationBasicCluster, readApplicationStatusAttribute)
 JNI_METHOD(void, ApplicationBasicCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8697,7 +8697,7 @@ JNI_METHOD(void, ApplicationBasicCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, ApplicationLauncherCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ApplicationLauncherCluster * cppCluster = new ApplicationLauncherCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -8707,7 +8707,7 @@ JNI_METHOD(jlong, ApplicationLauncherCluster, initWithDevice)(JNIEnv * env, jobj
 JNI_METHOD(void, ApplicationLauncherCluster, launchApp)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring data, jint catalogVendorId, jstring applicationId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationLauncherCluster * cppCluster;
 
@@ -8758,7 +8758,7 @@ JNI_METHOD(void, ApplicationLauncherCluster, launchApp)
 JNI_METHOD(void, ApplicationLauncherCluster, readApplicationLauncherListAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPApplicationLauncherApplicationLauncherListAttributeCallback * onSuccess =
         new CHIPApplicationLauncherApplicationLauncherListAttributeCallback(callback);
     if (!onSuccess)
@@ -8797,7 +8797,7 @@ JNI_METHOD(void, ApplicationLauncherCluster, readApplicationLauncherListAttribut
 JNI_METHOD(void, ApplicationLauncherCluster, readCatalogVendorIdAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8835,7 +8835,7 @@ JNI_METHOD(void, ApplicationLauncherCluster, readCatalogVendorIdAttribute)
 JNI_METHOD(void, ApplicationLauncherCluster, readApplicationIdAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8873,7 +8873,7 @@ JNI_METHOD(void, ApplicationLauncherCluster, readApplicationIdAttribute)
 JNI_METHOD(void, ApplicationLauncherCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -8909,7 +8909,7 @@ JNI_METHOD(void, ApplicationLauncherCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, AudioOutputCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     AudioOutputCluster * cppCluster = new AudioOutputCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -8919,7 +8919,7 @@ JNI_METHOD(jlong, AudioOutputCluster, initWithDevice)(JNIEnv * env, jobject self
 JNI_METHOD(void, AudioOutputCluster, renameOutput)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index, jstring name)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster;
 
@@ -8966,7 +8966,7 @@ JNI_METHOD(void, AudioOutputCluster, renameOutput)
 }
 JNI_METHOD(void, AudioOutputCluster, selectOutput)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster;
 
@@ -9012,7 +9012,7 @@ JNI_METHOD(void, AudioOutputCluster, selectOutput)(JNIEnv * env, jobject self, j
 
 JNI_METHOD(void, AudioOutputCluster, readAudioOutputListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPAudioOutputAudioOutputListAttributeCallback * onSuccess = new CHIPAudioOutputAudioOutputListAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9050,7 +9050,7 @@ JNI_METHOD(void, AudioOutputCluster, readAudioOutputListAttribute)(JNIEnv * env,
 JNI_METHOD(void, AudioOutputCluster, readCurrentAudioOutputAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9087,7 +9087,7 @@ JNI_METHOD(void, AudioOutputCluster, readCurrentAudioOutputAttribute)
 
 JNI_METHOD(void, AudioOutputCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9123,7 +9123,7 @@ JNI_METHOD(void, AudioOutputCluster, readClusterRevisionAttribute)(JNIEnv * env,
 }
 JNI_METHOD(jlong, BarrierControlCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     BarrierControlCluster * cppCluster = new BarrierControlCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -9133,7 +9133,7 @@ JNI_METHOD(jlong, BarrierControlCluster, initWithDevice)(JNIEnv * env, jobject s
 JNI_METHOD(void, BarrierControlCluster, barrierControlGoToPercent)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint percentOpen)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster;
 
@@ -9178,7 +9178,7 @@ JNI_METHOD(void, BarrierControlCluster, barrierControlGoToPercent)
 }
 JNI_METHOD(void, BarrierControlCluster, barrierControlStop)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster;
 
@@ -9225,7 +9225,7 @@ JNI_METHOD(void, BarrierControlCluster, barrierControlStop)(JNIEnv * env, jobjec
 JNI_METHOD(void, BarrierControlCluster, readBarrierMovingStateAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9263,7 +9263,7 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierMovingStateAttribute)
 JNI_METHOD(void, BarrierControlCluster, readBarrierSafetyStatusAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9301,7 +9301,7 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierSafetyStatusAttribute)
 JNI_METHOD(void, BarrierControlCluster, readBarrierCapabilitiesAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9339,7 +9339,7 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierCapabilitiesAttribute)
 JNI_METHOD(void, BarrierControlCluster, readBarrierPositionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9377,7 +9377,7 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierPositionAttribute)
 JNI_METHOD(void, BarrierControlCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9413,7 +9413,7 @@ JNI_METHOD(void, BarrierControlCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, BasicCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     BasicCluster * cppCluster = new BasicCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -9422,7 +9422,7 @@ JNI_METHOD(jlong, BasicCluster, initWithDevice)(JNIEnv * env, jobject self, jlon
 
 JNI_METHOD(void, BasicCluster, mfgSpecificPing)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster;
 
@@ -9468,7 +9468,7 @@ JNI_METHOD(void, BasicCluster, mfgSpecificPing)(JNIEnv * env, jobject self, jlon
 
 JNI_METHOD(void, BasicCluster, readInteractionModelVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9505,7 +9505,7 @@ JNI_METHOD(void, BasicCluster, readInteractionModelVersionAttribute)(JNIEnv * en
 
 JNI_METHOD(void, BasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9542,7 +9542,7 @@ JNI_METHOD(void, BasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject se
 
 JNI_METHOD(void, BasicCluster, readVendorIDAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9579,7 +9579,7 @@ JNI_METHOD(void, BasicCluster, readVendorIDAttribute)(JNIEnv * env, jobject self
 
 JNI_METHOD(void, BasicCluster, readProductNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9616,7 +9616,7 @@ JNI_METHOD(void, BasicCluster, readProductNameAttribute)(JNIEnv * env, jobject s
 
 JNI_METHOD(void, BasicCluster, readProductIDAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9653,7 +9653,7 @@ JNI_METHOD(void, BasicCluster, readProductIDAttribute)(JNIEnv * env, jobject sel
 
 JNI_METHOD(void, BasicCluster, readUserLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9691,7 +9691,7 @@ JNI_METHOD(void, BasicCluster, readUserLabelAttribute)(JNIEnv * env, jobject sel
 JNI_METHOD(void, BasicCluster, writeUserLabelAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -9730,7 +9730,7 @@ JNI_METHOD(void, BasicCluster, writeUserLabelAttribute)
 
 JNI_METHOD(void, BasicCluster, readLocationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9768,7 +9768,7 @@ JNI_METHOD(void, BasicCluster, readLocationAttribute)(JNIEnv * env, jobject self
 JNI_METHOD(void, BasicCluster, writeLocationAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -9807,7 +9807,7 @@ JNI_METHOD(void, BasicCluster, writeLocationAttribute)
 
 JNI_METHOD(void, BasicCluster, readHardwareVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9844,7 +9844,7 @@ JNI_METHOD(void, BasicCluster, readHardwareVersionAttribute)(JNIEnv * env, jobje
 
 JNI_METHOD(void, BasicCluster, readHardwareVersionStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9881,7 +9881,7 @@ JNI_METHOD(void, BasicCluster, readHardwareVersionStringAttribute)(JNIEnv * env,
 
 JNI_METHOD(void, BasicCluster, readSoftwareVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9918,7 +9918,7 @@ JNI_METHOD(void, BasicCluster, readSoftwareVersionAttribute)(JNIEnv * env, jobje
 
 JNI_METHOD(void, BasicCluster, readSoftwareVersionStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9955,7 +9955,7 @@ JNI_METHOD(void, BasicCluster, readSoftwareVersionStringAttribute)(JNIEnv * env,
 
 JNI_METHOD(void, BasicCluster, readManufacturingDateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -9992,7 +9992,7 @@ JNI_METHOD(void, BasicCluster, readManufacturingDateAttribute)(JNIEnv * env, job
 
 JNI_METHOD(void, BasicCluster, readPartNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10029,7 +10029,7 @@ JNI_METHOD(void, BasicCluster, readPartNumberAttribute)(JNIEnv * env, jobject se
 
 JNI_METHOD(void, BasicCluster, readProductURLAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10066,7 +10066,7 @@ JNI_METHOD(void, BasicCluster, readProductURLAttribute)(JNIEnv * env, jobject se
 
 JNI_METHOD(void, BasicCluster, readProductLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10103,7 +10103,7 @@ JNI_METHOD(void, BasicCluster, readProductLabelAttribute)(JNIEnv * env, jobject
 
 JNI_METHOD(void, BasicCluster, readSerialNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10140,7 +10140,7 @@ JNI_METHOD(void, BasicCluster, readSerialNumberAttribute)(JNIEnv * env, jobject
 
 JNI_METHOD(void, BasicCluster, readLocalConfigDisabledAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10178,7 +10178,7 @@ JNI_METHOD(void, BasicCluster, readLocalConfigDisabledAttribute)(JNIEnv * env, j
 JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -10215,7 +10215,7 @@ JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)
 
 JNI_METHOD(void, BasicCluster, readReachableAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10252,7 +10252,7 @@ JNI_METHOD(void, BasicCluster, readReachableAttribute)(JNIEnv * env, jobject sel
 
 JNI_METHOD(void, BasicCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10288,7 +10288,7 @@ JNI_METHOD(void, BasicCluster, readClusterRevisionAttribute)(JNIEnv * env, jobje
 }
 JNI_METHOD(jlong, BinaryInputBasicCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     BinaryInputBasicCluster * cppCluster = new BinaryInputBasicCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -10297,7 +10297,7 @@ JNI_METHOD(jlong, BinaryInputBasicCluster, initWithDevice)(JNIEnv * env, jobject
 
 JNI_METHOD(void, BinaryInputBasicCluster, readOutOfServiceAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10335,7 +10335,7 @@ JNI_METHOD(void, BinaryInputBasicCluster, readOutOfServiceAttribute)(JNIEnv * en
 JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -10372,7 +10372,7 @@ JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)
 
 JNI_METHOD(void, BinaryInputBasicCluster, readPresentValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10410,7 +10410,7 @@ JNI_METHOD(void, BinaryInputBasicCluster, readPresentValueAttribute)(JNIEnv * en
 JNI_METHOD(void, BinaryInputBasicCluster, writePresentValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -10447,7 +10447,7 @@ JNI_METHOD(void, BinaryInputBasicCluster, writePresentValueAttribute)
 
 JNI_METHOD(void, BinaryInputBasicCluster, readStatusFlagsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10485,7 +10485,7 @@ JNI_METHOD(void, BinaryInputBasicCluster, readStatusFlagsAttribute)(JNIEnv * env
 JNI_METHOD(void, BinaryInputBasicCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10521,7 +10521,7 @@ JNI_METHOD(void, BinaryInputBasicCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, BindingCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     BindingCluster * cppCluster = new BindingCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -10531,7 +10531,7 @@ JNI_METHOD(jlong, BindingCluster, initWithDevice)(JNIEnv * env, jobject self, jl
 JNI_METHOD(void, BindingCluster, bind)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BindingCluster * cppCluster;
 
@@ -10577,7 +10577,7 @@ JNI_METHOD(void, BindingCluster, bind)
 JNI_METHOD(void, BindingCluster, unbind)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BindingCluster * cppCluster;
 
@@ -10623,7 +10623,7 @@ JNI_METHOD(void, BindingCluster, unbind)
 
 JNI_METHOD(void, BindingCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10659,7 +10659,7 @@ JNI_METHOD(void, BindingCluster, readClusterRevisionAttribute)(JNIEnv * env, job
 }
 JNI_METHOD(jlong, BridgedDeviceBasicCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     BridgedDeviceBasicCluster * cppCluster = new BridgedDeviceBasicCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -10668,7 +10668,7 @@ JNI_METHOD(jlong, BridgedDeviceBasicCluster, initWithDevice)(JNIEnv * env, jobje
 
 JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10705,7 +10705,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorNameAttribute)(JNIEnv * en
 
 JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorIDAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10743,7 +10743,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorIDAttribute)(JNIEnv * env,
 JNI_METHOD(void, BridgedDeviceBasicCluster, readProductNameAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10780,7 +10780,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readProductNameAttribute)
 
 JNI_METHOD(void, BridgedDeviceBasicCluster, readUserLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10818,7 +10818,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readUserLabelAttribute)(JNIEnv * env
 JNI_METHOD(void, BridgedDeviceBasicCluster, writeUserLabelAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -10858,7 +10858,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, writeUserLabelAttribute)
 JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10896,7 +10896,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionAttribute)
 JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionStringAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10934,7 +10934,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionStringAttribute)
 JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -10972,7 +10972,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionAttribute)
 JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionStringAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -11010,7 +11010,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionStringAttribute)
 JNI_METHOD(void, BridgedDeviceBasicCluster, readManufacturingDateAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -11047,7 +11047,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readManufacturingDateAttribute)
 
 JNI_METHOD(void, BridgedDeviceBasicCluster, readPartNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -11084,7 +11084,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readPartNumberAttribute)(JNIEnv * en
 
 JNI_METHOD(void, BridgedDeviceBasicCluster, readProductURLAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -11122,7 +11122,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readProductURLAttribute)(JNIEnv * en
 JNI_METHOD(void, BridgedDeviceBasicCluster, readProductLabelAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -11160,7 +11160,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readProductLabelAttribute)
 JNI_METHOD(void, BridgedDeviceBasicCluster, readSerialNumberAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -11197,7 +11197,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readSerialNumberAttribute)
 
 JNI_METHOD(void, BridgedDeviceBasicCluster, readReachableAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -11235,7 +11235,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readReachableAttribute)(JNIEnv * env
 JNI_METHOD(void, BridgedDeviceBasicCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -11271,7 +11271,7 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, ColorControlCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ColorControlCluster * cppCluster = new ColorControlCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -11282,7 +11282,7 @@ JNI_METHOD(void, ColorControlCluster, colorLoopSet)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint updateFlags, jint action, jint direction, jint time,
  jint startHue, jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11329,7 +11329,7 @@ JNI_METHOD(void, ColorControlCluster, colorLoopSet)
 JNI_METHOD(void, ColorControlCluster, enhancedMoveHue)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11376,7 +11376,7 @@ JNI_METHOD(void, ColorControlCluster, enhancedMoveToHue)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint enhancedHue, jint direction, jint transitionTime,
  jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11424,7 +11424,7 @@ JNI_METHOD(void, ColorControlCluster, enhancedMoveToHueAndSaturation)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint enhancedHue, jint saturation, jint transitionTime,
  jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11472,7 +11472,7 @@ JNI_METHOD(void, ColorControlCluster, enhancedStepHue)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
  jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11519,7 +11519,7 @@ JNI_METHOD(void, ColorControlCluster, enhancedStepHue)
 JNI_METHOD(void, ColorControlCluster, moveColor)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint rateX, jint rateY, jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11566,7 +11566,7 @@ JNI_METHOD(void, ColorControlCluster, moveColorTemperature)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint colorTemperatureMinimum,
  jint colorTemperatureMaximum, jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11613,7 +11613,7 @@ JNI_METHOD(void, ColorControlCluster, moveColorTemperature)
 JNI_METHOD(void, ColorControlCluster, moveHue)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11659,7 +11659,7 @@ JNI_METHOD(void, ColorControlCluster, moveHue)
 JNI_METHOD(void, ColorControlCluster, moveSaturation)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11706,7 +11706,7 @@ JNI_METHOD(void, ColorControlCluster, moveToColor)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint colorX, jint colorY, jint transitionTime, jint optionsMask,
  jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11754,7 +11754,7 @@ JNI_METHOD(void, ColorControlCluster, moveToColorTemperature)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint colorTemperature, jint transitionTime, jint optionsMask,
  jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11802,7 +11802,7 @@ JNI_METHOD(void, ColorControlCluster, moveToHue)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint hue, jint direction, jint transitionTime, jint optionsMask,
  jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11850,7 +11850,7 @@ JNI_METHOD(void, ColorControlCluster, moveToHueAndSaturation)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint hue, jint saturation, jint transitionTime, jint optionsMask,
  jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11898,7 +11898,7 @@ JNI_METHOD(void, ColorControlCluster, moveToSaturation)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint saturation, jint transitionTime, jint optionsMask,
  jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11946,7 +11946,7 @@ JNI_METHOD(void, ColorControlCluster, stepColor)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepX, jint stepY, jint transitionTime, jint optionsMask,
  jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -11994,7 +11994,7 @@ JNI_METHOD(void, ColorControlCluster, stepColorTemperature)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
  jint colorTemperatureMinimum, jint colorTemperatureMaximum, jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -12042,7 +12042,7 @@ JNI_METHOD(void, ColorControlCluster, stepHue)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
  jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -12090,7 +12090,7 @@ JNI_METHOD(void, ColorControlCluster, stepSaturation)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
  jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -12137,7 +12137,7 @@ JNI_METHOD(void, ColorControlCluster, stepSaturation)
 JNI_METHOD(void, ColorControlCluster, stopMoveStep)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint optionsMask, jint optionsOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
 
@@ -12183,7 +12183,7 @@ JNI_METHOD(void, ColorControlCluster, stopMoveStep)
 
 JNI_METHOD(void, ColorControlCluster, readCurrentHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12221,7 +12221,7 @@ JNI_METHOD(void, ColorControlCluster, readCurrentHueAttribute)(JNIEnv * env, job
 JNI_METHOD(void, ColorControlCluster, readCurrentSaturationAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12258,7 +12258,7 @@ JNI_METHOD(void, ColorControlCluster, readCurrentSaturationAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readRemainingTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12295,7 +12295,7 @@ JNI_METHOD(void, ColorControlCluster, readRemainingTimeAttribute)(JNIEnv * env,
 
 JNI_METHOD(void, ColorControlCluster, readCurrentXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12332,7 +12332,7 @@ JNI_METHOD(void, ColorControlCluster, readCurrentXAttribute)(JNIEnv * env, jobje
 
 JNI_METHOD(void, ColorControlCluster, readCurrentYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12370,7 +12370,7 @@ JNI_METHOD(void, ColorControlCluster, readCurrentYAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, ColorControlCluster, readDriftCompensationAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12407,7 +12407,7 @@ JNI_METHOD(void, ColorControlCluster, readDriftCompensationAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readCompensationTextAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12444,7 +12444,7 @@ JNI_METHOD(void, ColorControlCluster, readCompensationTextAttribute)(JNIEnv * en
 
 JNI_METHOD(void, ColorControlCluster, readColorTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12481,7 +12481,7 @@ JNI_METHOD(void, ColorControlCluster, readColorTemperatureAttribute)(JNIEnv * en
 
 JNI_METHOD(void, ColorControlCluster, readColorModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12519,7 +12519,7 @@ JNI_METHOD(void, ColorControlCluster, readColorModeAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readColorControlOptionsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12557,7 +12557,7 @@ JNI_METHOD(void, ColorControlCluster, readColorControlOptionsAttribute)
 JNI_METHOD(void, ColorControlCluster, writeColorControlOptionsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -12595,7 +12595,7 @@ JNI_METHOD(void, ColorControlCluster, writeColorControlOptionsAttribute)
 JNI_METHOD(void, ColorControlCluster, readNumberOfPrimariesAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12632,7 +12632,7 @@ JNI_METHOD(void, ColorControlCluster, readNumberOfPrimariesAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readPrimary1XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12669,7 +12669,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary1XAttribute)(JNIEnv * env, jobj
 
 JNI_METHOD(void, ColorControlCluster, readPrimary1YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12707,7 +12707,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary1YAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary1IntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12744,7 +12744,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary1IntensityAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readPrimary2XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12781,7 +12781,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary2XAttribute)(JNIEnv * env, jobj
 
 JNI_METHOD(void, ColorControlCluster, readPrimary2YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12819,7 +12819,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary2YAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary2IntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12856,7 +12856,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary2IntensityAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readPrimary3XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12893,7 +12893,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary3XAttribute)(JNIEnv * env, jobj
 
 JNI_METHOD(void, ColorControlCluster, readPrimary3YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12931,7 +12931,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary3YAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary3IntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -12968,7 +12968,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary3IntensityAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readPrimary4XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13005,7 +13005,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary4XAttribute)(JNIEnv * env, jobj
 
 JNI_METHOD(void, ColorControlCluster, readPrimary4YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13043,7 +13043,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary4YAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary4IntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13080,7 +13080,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary4IntensityAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readPrimary5XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13117,7 +13117,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary5XAttribute)(JNIEnv * env, jobj
 
 JNI_METHOD(void, ColorControlCluster, readPrimary5YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13155,7 +13155,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary5YAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary5IntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13192,7 +13192,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary5IntensityAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readPrimary6XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13229,7 +13229,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary6XAttribute)(JNIEnv * env, jobj
 
 JNI_METHOD(void, ColorControlCluster, readPrimary6YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13267,7 +13267,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary6YAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary6IntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13304,7 +13304,7 @@ JNI_METHOD(void, ColorControlCluster, readPrimary6IntensityAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readWhitePointXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13342,7 +13342,7 @@ JNI_METHOD(void, ColorControlCluster, readWhitePointXAttribute)(JNIEnv * env, jo
 JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -13379,7 +13379,7 @@ JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readWhitePointYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13417,7 +13417,7 @@ JNI_METHOD(void, ColorControlCluster, readWhitePointYAttribute)(JNIEnv * env, jo
 JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -13454,7 +13454,7 @@ JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readColorPointRXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13492,7 +13492,7 @@ JNI_METHOD(void, ColorControlCluster, readColorPointRXAttribute)(JNIEnv * env, j
 JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -13529,7 +13529,7 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readColorPointRYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13567,7 +13567,7 @@ JNI_METHOD(void, ColorControlCluster, readColorPointRYAttribute)(JNIEnv * env, j
 JNI_METHOD(void, ColorControlCluster, writeColorPointRYAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -13605,7 +13605,7 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRYAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorPointRIntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13643,7 +13643,7 @@ JNI_METHOD(void, ColorControlCluster, readColorPointRIntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -13680,7 +13680,7 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readColorPointGXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13718,7 +13718,7 @@ JNI_METHOD(void, ColorControlCluster, readColorPointGXAttribute)(JNIEnv * env, j
 JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -13755,7 +13755,7 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readColorPointGYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13793,7 +13793,7 @@ JNI_METHOD(void, ColorControlCluster, readColorPointGYAttribute)(JNIEnv * env, j
 JNI_METHOD(void, ColorControlCluster, writeColorPointGYAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -13831,7 +13831,7 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGYAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorPointGIntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13869,7 +13869,7 @@ JNI_METHOD(void, ColorControlCluster, readColorPointGIntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, writeColorPointGIntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -13906,7 +13906,7 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGIntensityAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readColorPointBXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -13944,7 +13944,7 @@ JNI_METHOD(void, ColorControlCluster, readColorPointBXAttribute)(JNIEnv * env, j
 JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -13981,7 +13981,7 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readColorPointBYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14019,7 +14019,7 @@ JNI_METHOD(void, ColorControlCluster, readColorPointBYAttribute)(JNIEnv * env, j
 JNI_METHOD(void, ColorControlCluster, writeColorPointBYAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -14057,7 +14057,7 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBYAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorPointBIntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14095,7 +14095,7 @@ JNI_METHOD(void, ColorControlCluster, readColorPointBIntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, writeColorPointBIntensityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -14133,7 +14133,7 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBIntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, readEnhancedCurrentHueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14171,7 +14171,7 @@ JNI_METHOD(void, ColorControlCluster, readEnhancedCurrentHueAttribute)
 JNI_METHOD(void, ColorControlCluster, readEnhancedColorModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14208,7 +14208,7 @@ JNI_METHOD(void, ColorControlCluster, readEnhancedColorModeAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readColorLoopActiveAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14246,7 +14246,7 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopActiveAttribute)(JNIEnv * env
 JNI_METHOD(void, ColorControlCluster, readColorLoopDirectionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14283,7 +14283,7 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopDirectionAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readColorLoopTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14321,7 +14321,7 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopTimeAttribute)(JNIEnv * env,
 JNI_METHOD(void, ColorControlCluster, readColorLoopStartEnhancedHueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14359,7 +14359,7 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopStartEnhancedHueAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorLoopStoredEnhancedHueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14397,7 +14397,7 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopStoredEnhancedHueAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorCapabilitiesAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14435,7 +14435,7 @@ JNI_METHOD(void, ColorControlCluster, readColorCapabilitiesAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMinAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14473,7 +14473,7 @@ JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMinAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMaxAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14511,7 +14511,7 @@ JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMaxAttribute)
 JNI_METHOD(void, ColorControlCluster, readCoupleColorTempToLevelMinMiredsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14549,7 +14549,7 @@ JNI_METHOD(void, ColorControlCluster, readCoupleColorTempToLevelMinMiredsAttribu
 JNI_METHOD(void, ColorControlCluster, readStartUpColorTemperatureMiredsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14587,7 +14587,7 @@ JNI_METHOD(void, ColorControlCluster, readStartUpColorTemperatureMiredsAttribute
 JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -14625,7 +14625,7 @@ JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribut
 
 JNI_METHOD(void, ColorControlCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14661,7 +14661,7 @@ JNI_METHOD(void, ColorControlCluster, readClusterRevisionAttribute)(JNIEnv * env
 }
 JNI_METHOD(jlong, ContentLauncherCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ContentLauncherCluster * cppCluster = new ContentLauncherCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -14671,7 +14671,7 @@ JNI_METHOD(jlong, ContentLauncherCluster, initWithDevice)(JNIEnv * env, jobject
 JNI_METHOD(void, ContentLauncherCluster, launchContent)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean autoPlay, jstring data)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster;
 
@@ -14719,7 +14719,7 @@ JNI_METHOD(void, ContentLauncherCluster, launchContent)
 JNI_METHOD(void, ContentLauncherCluster, launchURL)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring contentURL, jstring displayString)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster;
 
@@ -14770,7 +14770,7 @@ JNI_METHOD(void, ContentLauncherCluster, launchURL)
 JNI_METHOD(void, ContentLauncherCluster, readAcceptsHeaderListAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPContentLauncherAcceptsHeaderListAttributeCallback * onSuccess =
         new CHIPContentLauncherAcceptsHeaderListAttributeCallback(callback);
     if (!onSuccess)
@@ -14809,7 +14809,7 @@ JNI_METHOD(void, ContentLauncherCluster, readAcceptsHeaderListAttribute)
 JNI_METHOD(void, ContentLauncherCluster, readSupportedStreamingTypesAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPContentLauncherSupportedStreamingTypesAttributeCallback * onSuccess =
         new CHIPContentLauncherSupportedStreamingTypesAttributeCallback(callback);
     if (!onSuccess)
@@ -14848,7 +14848,7 @@ JNI_METHOD(void, ContentLauncherCluster, readSupportedStreamingTypesAttribute)
 JNI_METHOD(void, ContentLauncherCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14884,7 +14884,7 @@ JNI_METHOD(void, ContentLauncherCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, DescriptorCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     DescriptorCluster * cppCluster = new DescriptorCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -14893,7 +14893,7 @@ JNI_METHOD(jlong, DescriptorCluster, initWithDevice)(JNIEnv * env, jobject self,
 
 JNI_METHOD(void, DescriptorCluster, readDeviceListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDescriptorDeviceListAttributeCallback * onSuccess = new CHIPDescriptorDeviceListAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14930,7 +14930,7 @@ JNI_METHOD(void, DescriptorCluster, readDeviceListAttribute)(JNIEnv * env, jobje
 
 JNI_METHOD(void, DescriptorCluster, readServerListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDescriptorServerListAttributeCallback * onSuccess = new CHIPDescriptorServerListAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -14967,7 +14967,7 @@ JNI_METHOD(void, DescriptorCluster, readServerListAttribute)(JNIEnv * env, jobje
 
 JNI_METHOD(void, DescriptorCluster, readClientListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDescriptorClientListAttributeCallback * onSuccess = new CHIPDescriptorClientListAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -15004,7 +15004,7 @@ JNI_METHOD(void, DescriptorCluster, readClientListAttribute)(JNIEnv * env, jobje
 
 JNI_METHOD(void, DescriptorCluster, readPartsListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDescriptorPartsListAttributeCallback * onSuccess = new CHIPDescriptorPartsListAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -15041,7 +15041,7 @@ JNI_METHOD(void, DescriptorCluster, readPartsListAttribute)(JNIEnv * env, jobjec
 
 JNI_METHOD(void, DescriptorCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -15077,7 +15077,7 @@ JNI_METHOD(void, DescriptorCluster, readClusterRevisionAttribute)(JNIEnv * env,
 }
 JNI_METHOD(jlong, DiagnosticLogsCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     DiagnosticLogsCluster * cppCluster = new DiagnosticLogsCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -15088,7 +15088,7 @@ JNI_METHOD(void, DiagnosticLogsCluster, retrieveLogsRequest)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint intent, jint requestedProtocol,
  jbyteArray transferFileDesignator)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DiagnosticLogsCluster * cppCluster;
 
@@ -15136,7 +15136,7 @@ JNI_METHOD(void, DiagnosticLogsCluster, retrieveLogsRequest)
 }
 JNI_METHOD(jlong, DoorLockCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     DoorLockCluster * cppCluster = new DoorLockCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -15145,7 +15145,7 @@ JNI_METHOD(jlong, DoorLockCluster, initWithDevice)(JNIEnv * env, jobject self, j
 
 JNI_METHOD(void, DoorLockCluster, clearAllPins)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15190,7 +15190,7 @@ JNI_METHOD(void, DoorLockCluster, clearAllPins)(JNIEnv * env, jobject self, jlon
 }
 JNI_METHOD(void, DoorLockCluster, clearAllRfids)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15236,7 +15236,7 @@ JNI_METHOD(void, DoorLockCluster, clearAllRfids)(JNIEnv * env, jobject self, jlo
 JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15281,7 +15281,7 @@ JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule)
 }
 JNI_METHOD(void, DoorLockCluster, clearPin)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15326,7 +15326,7 @@ JNI_METHOD(void, DoorLockCluster, clearPin)(JNIEnv * env, jobject self, jlong cl
 }
 JNI_METHOD(void, DoorLockCluster, clearRfid)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15372,7 +15372,7 @@ JNI_METHOD(void, DoorLockCluster, clearRfid)(JNIEnv * env, jobject self, jlong c
 JNI_METHOD(void, DoorLockCluster, clearWeekdaySchedule)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15418,7 +15418,7 @@ JNI_METHOD(void, DoorLockCluster, clearWeekdaySchedule)
 JNI_METHOD(void, DoorLockCluster, clearYeardaySchedule)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15464,7 +15464,7 @@ JNI_METHOD(void, DoorLockCluster, clearYeardaySchedule)
 JNI_METHOD(void, DoorLockCluster, getHolidaySchedule)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15509,7 +15509,7 @@ JNI_METHOD(void, DoorLockCluster, getHolidaySchedule)
 }
 JNI_METHOD(void, DoorLockCluster, getLogRecord)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint logIndex)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15554,7 +15554,7 @@ JNI_METHOD(void, DoorLockCluster, getLogRecord)(JNIEnv * env, jobject self, jlon
 }
 JNI_METHOD(void, DoorLockCluster, getPin)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15599,7 +15599,7 @@ JNI_METHOD(void, DoorLockCluster, getPin)(JNIEnv * env, jobject self, jlong clus
 }
 JNI_METHOD(void, DoorLockCluster, getRfid)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15644,7 +15644,7 @@ JNI_METHOD(void, DoorLockCluster, getRfid)(JNIEnv * env, jobject self, jlong clu
 }
 JNI_METHOD(void, DoorLockCluster, getUserType)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15690,7 +15690,7 @@ JNI_METHOD(void, DoorLockCluster, getUserType)(JNIEnv * env, jobject self, jlong
 JNI_METHOD(void, DoorLockCluster, getWeekdaySchedule)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15736,7 +15736,7 @@ JNI_METHOD(void, DoorLockCluster, getWeekdaySchedule)
 JNI_METHOD(void, DoorLockCluster, getYeardaySchedule)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15781,7 +15781,7 @@ JNI_METHOD(void, DoorLockCluster, getYeardaySchedule)
 }
 JNI_METHOD(void, DoorLockCluster, lockDoor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring pin)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15830,7 +15830,7 @@ JNI_METHOD(void, DoorLockCluster, setHolidaySchedule)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jlong localStartTime, jlong localEndTime,
  jint operatingModeDuringHoliday)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15877,7 +15877,7 @@ JNI_METHOD(void, DoorLockCluster, setHolidaySchedule)
 JNI_METHOD(void, DoorLockCluster, setPin)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userStatus, jint userType, jstring pin)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15925,7 +15925,7 @@ JNI_METHOD(void, DoorLockCluster, setPin)
 JNI_METHOD(void, DoorLockCluster, setRfid)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userStatus, jint userType, jstring id)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -15973,7 +15973,7 @@ JNI_METHOD(void, DoorLockCluster, setRfid)
 JNI_METHOD(void, DoorLockCluster, setUserType)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userType)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -16020,7 +16020,7 @@ JNI_METHOD(void, DoorLockCluster, setWeekdaySchedule)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId, jint daysMask, jint startHour,
  jint startMinute, jint endHour, jint endMinute)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -16068,7 +16068,7 @@ JNI_METHOD(void, DoorLockCluster, setYeardaySchedule)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId, jlong localStartTime,
  jlong localEndTime)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -16114,7 +16114,7 @@ JNI_METHOD(void, DoorLockCluster, setYeardaySchedule)
 }
 JNI_METHOD(void, DoorLockCluster, unlockDoor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring pin)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -16162,7 +16162,7 @@ JNI_METHOD(void, DoorLockCluster, unlockDoor)(JNIEnv * env, jobject self, jlong
 JNI_METHOD(void, DoorLockCluster, unlockWithTimeout)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint timeoutInSeconds, jstring pin)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
 
@@ -16210,7 +16210,7 @@ JNI_METHOD(void, DoorLockCluster, unlockWithTimeout)
 
 JNI_METHOD(void, DoorLockCluster, readLockStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16247,7 +16247,7 @@ JNI_METHOD(void, DoorLockCluster, readLockStateAttribute)(JNIEnv * env, jobject
 
 JNI_METHOD(void, DoorLockCluster, readLockTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16284,7 +16284,7 @@ JNI_METHOD(void, DoorLockCluster, readLockTypeAttribute)(JNIEnv * env, jobject s
 
 JNI_METHOD(void, DoorLockCluster, readActuatorEnabledAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16321,7 +16321,7 @@ JNI_METHOD(void, DoorLockCluster, readActuatorEnabledAttribute)(JNIEnv * env, jo
 
 JNI_METHOD(void, DoorLockCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16357,7 +16357,7 @@ JNI_METHOD(void, DoorLockCluster, readClusterRevisionAttribute)(JNIEnv * env, jo
 }
 JNI_METHOD(jlong, ElectricalMeasurementCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ElectricalMeasurementCluster * cppCluster = new ElectricalMeasurementCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -16367,7 +16367,7 @@ JNI_METHOD(jlong, ElectricalMeasurementCluster, initWithDevice)(JNIEnv * env, jo
 JNI_METHOD(void, ElectricalMeasurementCluster, readMeasurementTypeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16405,7 +16405,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readMeasurementTypeAttribute)
 JNI_METHOD(void, ElectricalMeasurementCluster, readTotalActivePowerAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32sAttributeCallback * onSuccess = new CHIPInt32sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16443,7 +16443,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readTotalActivePowerAttribute)
 JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16481,7 +16481,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageAttribute)
 JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMinAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16519,7 +16519,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMinAttribute)
 JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMaxAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16557,7 +16557,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMaxAttribute)
 JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16595,7 +16595,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentAttribute)
 JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMinAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16633,7 +16633,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMinAttribute)
 JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMaxAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16671,7 +16671,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMaxAttribute)
 JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16709,7 +16709,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerAttribute)
 JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMinAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16747,7 +16747,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMinAttribute)
 JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMaxAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16785,7 +16785,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMaxAttribute)
 JNI_METHOD(void, ElectricalMeasurementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16821,7 +16821,7 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, EthernetNetworkDiagnosticsCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     EthernetNetworkDiagnosticsCluster * cppCluster = new EthernetNetworkDiagnosticsCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -16830,7 +16830,7 @@ JNI_METHOD(jlong, EthernetNetworkDiagnosticsCluster, initWithDevice)(JNIEnv * en
 
 JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster;
 
@@ -16877,7 +16877,7 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, j
 JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketRxCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16915,7 +16915,7 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketRxCountAttribute)
 JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketTxCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16953,7 +16953,7 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketTxCountAttribute)
 JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTxErrCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -16991,7 +16991,7 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTxErrCountAttribute)
 JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCollisionCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17029,7 +17029,7 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCollisionCountAttribute)
 JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readOverrunCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17067,7 +17067,7 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readOverrunCountAttribute)
 JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17103,7 +17103,7 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readClusterRevisionAttribute
 }
 JNI_METHOD(jlong, FixedLabelCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     FixedLabelCluster * cppCluster = new FixedLabelCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -17112,7 +17112,7 @@ JNI_METHOD(jlong, FixedLabelCluster, initWithDevice)(JNIEnv * env, jobject self,
 
 JNI_METHOD(void, FixedLabelCluster, readLabelListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPFixedLabelLabelListAttributeCallback * onSuccess = new CHIPFixedLabelLabelListAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17149,7 +17149,7 @@ JNI_METHOD(void, FixedLabelCluster, readLabelListAttribute)(JNIEnv * env, jobjec
 
 JNI_METHOD(void, FixedLabelCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17185,7 +17185,7 @@ JNI_METHOD(void, FixedLabelCluster, readClusterRevisionAttribute)(JNIEnv * env,
 }
 JNI_METHOD(jlong, FlowMeasurementCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     FlowMeasurementCluster * cppCluster = new FlowMeasurementCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -17194,7 +17194,7 @@ JNI_METHOD(jlong, FlowMeasurementCluster, initWithDevice)(JNIEnv * env, jobject
 
 JNI_METHOD(void, FlowMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17232,7 +17232,7 @@ JNI_METHOD(void, FlowMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * en
 JNI_METHOD(void, FlowMeasurementCluster, readMinMeasuredValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17270,7 +17270,7 @@ JNI_METHOD(void, FlowMeasurementCluster, readMinMeasuredValueAttribute)
 JNI_METHOD(void, FlowMeasurementCluster, readMaxMeasuredValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17308,7 +17308,7 @@ JNI_METHOD(void, FlowMeasurementCluster, readMaxMeasuredValueAttribute)
 JNI_METHOD(void, FlowMeasurementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17344,7 +17344,7 @@ JNI_METHOD(void, FlowMeasurementCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, GeneralCommissioningCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     GeneralCommissioningCluster * cppCluster = new GeneralCommissioningCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -17354,7 +17354,7 @@ JNI_METHOD(jlong, GeneralCommissioningCluster, initWithDevice)(JNIEnv * env, job
 JNI_METHOD(void, GeneralCommissioningCluster, armFailSafe)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint expiryLengthSeconds, jlong breadcrumb, jlong timeoutMs)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster;
 
@@ -17399,7 +17399,7 @@ JNI_METHOD(void, GeneralCommissioningCluster, armFailSafe)
 }
 JNI_METHOD(void, GeneralCommissioningCluster, commissioningComplete)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster;
 
@@ -17446,7 +17446,7 @@ JNI_METHOD(void, GeneralCommissioningCluster, setRegulatoryConfig)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint location, jstring countryCode, jlong breadcrumb,
  jlong timeoutMs)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster;
 
@@ -17496,7 +17496,7 @@ JNI_METHOD(void, GeneralCommissioningCluster, setRegulatoryConfig)
 JNI_METHOD(void, GeneralCommissioningCluster, readBreadcrumbAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17534,7 +17534,7 @@ JNI_METHOD(void, GeneralCommissioningCluster, readBreadcrumbAttribute)
 JNI_METHOD(void, GeneralCommissioningCluster, writeBreadcrumbAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -17572,7 +17572,7 @@ JNI_METHOD(void, GeneralCommissioningCluster, writeBreadcrumbAttribute)
 JNI_METHOD(void, GeneralCommissioningCluster, readBasicCommissioningInfoListAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback * onSuccess =
         new CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback(callback);
     if (!onSuccess)
@@ -17611,7 +17611,7 @@ JNI_METHOD(void, GeneralCommissioningCluster, readBasicCommissioningInfoListAttr
 JNI_METHOD(void, GeneralCommissioningCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17647,7 +17647,7 @@ JNI_METHOD(void, GeneralCommissioningCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, GeneralDiagnosticsCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     GeneralDiagnosticsCluster * cppCluster = new GeneralDiagnosticsCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -17657,7 +17657,7 @@ JNI_METHOD(jlong, GeneralDiagnosticsCluster, initWithDevice)(JNIEnv * env, jobje
 JNI_METHOD(void, GeneralDiagnosticsCluster, readNetworkInterfacesAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback * onSuccess =
         new CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback(callback);
     if (!onSuccess)
@@ -17696,7 +17696,7 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readNetworkInterfacesAttribute)
 JNI_METHOD(void, GeneralDiagnosticsCluster, readRebootCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17733,7 +17733,7 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readRebootCountAttribute)
 
 JNI_METHOD(void, GeneralDiagnosticsCluster, readUpTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17771,7 +17771,7 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readUpTimeAttribute)(JNIEnv * env, j
 JNI_METHOD(void, GeneralDiagnosticsCluster, readTotalOperationalHoursAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17809,7 +17809,7 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readTotalOperationalHoursAttribute)
 JNI_METHOD(void, GeneralDiagnosticsCluster, readBootReasonsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17847,7 +17847,7 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readBootReasonsAttribute)
 JNI_METHOD(void, GeneralDiagnosticsCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17883,7 +17883,7 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, GroupKeyManagementCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     GroupKeyManagementCluster * cppCluster = new GroupKeyManagementCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -17892,7 +17892,7 @@ JNI_METHOD(jlong, GroupKeyManagementCluster, initWithDevice)(JNIEnv * env, jobje
 
 JNI_METHOD(void, GroupKeyManagementCluster, readGroupsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPGroupKeyManagementGroupsAttributeCallback * onSuccess = new CHIPGroupKeyManagementGroupsAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17929,7 +17929,7 @@ JNI_METHOD(void, GroupKeyManagementCluster, readGroupsAttribute)(JNIEnv * env, j
 
 JNI_METHOD(void, GroupKeyManagementCluster, readGroupKeysAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPGroupKeyManagementGroupKeysAttributeCallback * onSuccess = new CHIPGroupKeyManagementGroupKeysAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -17967,7 +17967,7 @@ JNI_METHOD(void, GroupKeyManagementCluster, readGroupKeysAttribute)(JNIEnv * env
 JNI_METHOD(void, GroupKeyManagementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -18003,7 +18003,7 @@ JNI_METHOD(void, GroupKeyManagementCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, GroupsCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     GroupsCluster * cppCluster = new GroupsCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -18013,7 +18013,7 @@ JNI_METHOD(jlong, GroupsCluster, initWithDevice)(JNIEnv * env, jobject self, jlo
 JNI_METHOD(void, GroupsCluster, addGroup)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jstring groupName)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
 
@@ -18061,7 +18061,7 @@ JNI_METHOD(void, GroupsCluster, addGroup)
 JNI_METHOD(void, GroupsCluster, addGroupIfIdentifying)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jstring groupName)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
 
@@ -18109,7 +18109,7 @@ JNI_METHOD(void, GroupsCluster, addGroupIfIdentifying)
 JNI_METHOD(void, GroupsCluster, getGroupMembership)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupCount, jint groupList)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
 
@@ -18154,7 +18154,7 @@ JNI_METHOD(void, GroupsCluster, getGroupMembership)
 }
 JNI_METHOD(void, GroupsCluster, removeAllGroups)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
 
@@ -18199,7 +18199,7 @@ JNI_METHOD(void, GroupsCluster, removeAllGroups)(JNIEnv * env, jobject self, jlo
 }
 JNI_METHOD(void, GroupsCluster, removeGroup)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
 
@@ -18244,7 +18244,7 @@ JNI_METHOD(void, GroupsCluster, removeGroup)(JNIEnv * env, jobject self, jlong c
 }
 JNI_METHOD(void, GroupsCluster, viewGroup)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
 
@@ -18290,7 +18290,7 @@ JNI_METHOD(void, GroupsCluster, viewGroup)(JNIEnv * env, jobject self, jlong clu
 
 JNI_METHOD(void, GroupsCluster, readNameSupportAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -18327,7 +18327,7 @@ JNI_METHOD(void, GroupsCluster, readNameSupportAttribute)(JNIEnv * env, jobject
 
 JNI_METHOD(void, GroupsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -18363,7 +18363,7 @@ JNI_METHOD(void, GroupsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobj
 }
 JNI_METHOD(jlong, IdentifyCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     IdentifyCluster * cppCluster = new IdentifyCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -18372,7 +18372,7 @@ JNI_METHOD(jlong, IdentifyCluster, initWithDevice)(JNIEnv * env, jobject self, j
 
 JNI_METHOD(void, IdentifyCluster, identify)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint identifyTime)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster;
 
@@ -18417,7 +18417,7 @@ JNI_METHOD(void, IdentifyCluster, identify)(JNIEnv * env, jobject self, jlong cl
 }
 JNI_METHOD(void, IdentifyCluster, identifyQuery)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster;
 
@@ -18463,7 +18463,7 @@ JNI_METHOD(void, IdentifyCluster, identifyQuery)(JNIEnv * env, jobject self, jlo
 JNI_METHOD(void, IdentifyCluster, triggerEffect)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint effectIdentifier, jint effectVariant)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster;
 
@@ -18509,7 +18509,7 @@ JNI_METHOD(void, IdentifyCluster, triggerEffect)
 
 JNI_METHOD(void, IdentifyCluster, readIdentifyTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -18547,7 +18547,7 @@ JNI_METHOD(void, IdentifyCluster, readIdentifyTimeAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -18584,7 +18584,7 @@ JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)
 
 JNI_METHOD(void, IdentifyCluster, readIdentifyTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -18621,7 +18621,7 @@ JNI_METHOD(void, IdentifyCluster, readIdentifyTypeAttribute)(JNIEnv * env, jobje
 
 JNI_METHOD(void, IdentifyCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -18657,7 +18657,7 @@ JNI_METHOD(void, IdentifyCluster, readClusterRevisionAttribute)(JNIEnv * env, jo
 }
 JNI_METHOD(jlong, KeypadInputCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     KeypadInputCluster * cppCluster = new KeypadInputCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -18666,7 +18666,7 @@ JNI_METHOD(jlong, KeypadInputCluster, initWithDevice)(JNIEnv * env, jobject self
 
 JNI_METHOD(void, KeypadInputCluster, sendKey)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint keyCode)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     KeypadInputCluster * cppCluster;
 
@@ -18712,7 +18712,7 @@ JNI_METHOD(void, KeypadInputCluster, sendKey)(JNIEnv * env, jobject self, jlong
 
 JNI_METHOD(void, KeypadInputCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -18748,7 +18748,7 @@ JNI_METHOD(void, KeypadInputCluster, readClusterRevisionAttribute)(JNIEnv * env,
 }
 JNI_METHOD(jlong, LevelControlCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     LevelControlCluster * cppCluster = new LevelControlCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -18758,7 +18758,7 @@ JNI_METHOD(jlong, LevelControlCluster, initWithDevice)(JNIEnv * env, jobject sel
 JNI_METHOD(void, LevelControlCluster, move)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionMask, jint optionOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
 
@@ -18805,7 +18805,7 @@ JNI_METHOD(void, LevelControlCluster, moveToLevel)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint level, jint transitionTime, jint optionMask,
  jint optionOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
 
@@ -18851,7 +18851,7 @@ JNI_METHOD(void, LevelControlCluster, moveToLevel)
 JNI_METHOD(void, LevelControlCluster, moveToLevelWithOnOff)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint level, jint transitionTime)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
 
@@ -18897,7 +18897,7 @@ JNI_METHOD(void, LevelControlCluster, moveToLevelWithOnOff)
 JNI_METHOD(void, LevelControlCluster, moveWithOnOff)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
 
@@ -18944,7 +18944,7 @@ JNI_METHOD(void, LevelControlCluster, step)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint optionMask,
  jint optionOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
 
@@ -18991,7 +18991,7 @@ JNI_METHOD(void, LevelControlCluster, step)
 JNI_METHOD(void, LevelControlCluster, stepWithOnOff)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
 
@@ -19037,7 +19037,7 @@ JNI_METHOD(void, LevelControlCluster, stepWithOnOff)
 JNI_METHOD(void, LevelControlCluster, stop)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint optionMask, jint optionOverride)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
 
@@ -19082,7 +19082,7 @@ JNI_METHOD(void, LevelControlCluster, stop)
 }
 JNI_METHOD(void, LevelControlCluster, stopWithOnOff)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
 
@@ -19128,7 +19128,7 @@ JNI_METHOD(void, LevelControlCluster, stopWithOnOff)(JNIEnv * env, jobject self,
 
 JNI_METHOD(void, LevelControlCluster, readCurrentLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -19165,7 +19165,7 @@ JNI_METHOD(void, LevelControlCluster, readCurrentLevelAttribute)(JNIEnv * env, j
 
 JNI_METHOD(void, LevelControlCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -19201,7 +19201,7 @@ JNI_METHOD(void, LevelControlCluster, readClusterRevisionAttribute)(JNIEnv * env
 }
 JNI_METHOD(jlong, LowPowerCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     LowPowerCluster * cppCluster = new LowPowerCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -19210,7 +19210,7 @@ JNI_METHOD(jlong, LowPowerCluster, initWithDevice)(JNIEnv * env, jobject self, j
 
 JNI_METHOD(void, LowPowerCluster, sleep)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LowPowerCluster * cppCluster;
 
@@ -19256,7 +19256,7 @@ JNI_METHOD(void, LowPowerCluster, sleep)(JNIEnv * env, jobject self, jlong clust
 
 JNI_METHOD(void, LowPowerCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -19292,7 +19292,7 @@ JNI_METHOD(void, LowPowerCluster, readClusterRevisionAttribute)(JNIEnv * env, jo
 }
 JNI_METHOD(jlong, MediaInputCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     MediaInputCluster * cppCluster = new MediaInputCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -19301,7 +19301,7 @@ JNI_METHOD(jlong, MediaInputCluster, initWithDevice)(JNIEnv * env, jobject self,
 
 JNI_METHOD(void, MediaInputCluster, hideInputStatus)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
 
@@ -19347,7 +19347,7 @@ JNI_METHOD(void, MediaInputCluster, hideInputStatus)(JNIEnv * env, jobject self,
 JNI_METHOD(void, MediaInputCluster, renameInput)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index, jstring name)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
 
@@ -19394,7 +19394,7 @@ JNI_METHOD(void, MediaInputCluster, renameInput)
 }
 JNI_METHOD(void, MediaInputCluster, selectInput)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
 
@@ -19439,7 +19439,7 @@ JNI_METHOD(void, MediaInputCluster, selectInput)(JNIEnv * env, jobject self, jlo
 }
 JNI_METHOD(void, MediaInputCluster, showInputStatus)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
 
@@ -19485,7 +19485,7 @@ JNI_METHOD(void, MediaInputCluster, showInputStatus)(JNIEnv * env, jobject self,
 
 JNI_METHOD(void, MediaInputCluster, readMediaInputListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPMediaInputMediaInputListAttributeCallback * onSuccess = new CHIPMediaInputMediaInputListAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -19522,7 +19522,7 @@ JNI_METHOD(void, MediaInputCluster, readMediaInputListAttribute)(JNIEnv * env, j
 
 JNI_METHOD(void, MediaInputCluster, readCurrentMediaInputAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -19559,7 +19559,7 @@ JNI_METHOD(void, MediaInputCluster, readCurrentMediaInputAttribute)(JNIEnv * env
 
 JNI_METHOD(void, MediaInputCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -19595,7 +19595,7 @@ JNI_METHOD(void, MediaInputCluster, readClusterRevisionAttribute)(JNIEnv * env,
 }
 JNI_METHOD(jlong, MediaPlaybackCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     MediaPlaybackCluster * cppCluster = new MediaPlaybackCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -19604,7 +19604,7 @@ JNI_METHOD(jlong, MediaPlaybackCluster, initWithDevice)(JNIEnv * env, jobject se
 
 JNI_METHOD(void, MediaPlaybackCluster, mediaFastForward)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
 
@@ -19649,7 +19649,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaFastForward)(JNIEnv * env, jobject s
 }
 JNI_METHOD(void, MediaPlaybackCluster, mediaNext)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
 
@@ -19694,7 +19694,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaNext)(JNIEnv * env, jobject self, jl
 }
 JNI_METHOD(void, MediaPlaybackCluster, mediaPause)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
 
@@ -19739,7 +19739,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPause)(JNIEnv * env, jobject self, j
 }
 JNI_METHOD(void, MediaPlaybackCluster, mediaPlay)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
 
@@ -19784,7 +19784,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPlay)(JNIEnv * env, jobject self, jl
 }
 JNI_METHOD(void, MediaPlaybackCluster, mediaPrevious)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
 
@@ -19829,7 +19829,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPrevious)(JNIEnv * env, jobject self
 }
 JNI_METHOD(void, MediaPlaybackCluster, mediaRewind)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
 
@@ -19874,7 +19874,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaRewind)(JNIEnv * env, jobject self,
 }
 JNI_METHOD(void, MediaPlaybackCluster, mediaSeek)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong position)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
 
@@ -19920,7 +19920,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSeek)(JNIEnv * env, jobject self, jl
 JNI_METHOD(void, MediaPlaybackCluster, mediaSkipBackward)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong deltaPositionMilliseconds)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
 
@@ -19966,7 +19966,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSkipBackward)
 JNI_METHOD(void, MediaPlaybackCluster, mediaSkipForward)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong deltaPositionMilliseconds)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
 
@@ -20011,7 +20011,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSkipForward)
 }
 JNI_METHOD(void, MediaPlaybackCluster, mediaStartOver)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
 
@@ -20056,7 +20056,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStartOver)(JNIEnv * env, jobject sel
 }
 JNI_METHOD(void, MediaPlaybackCluster, mediaStop)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
 
@@ -20102,7 +20102,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStop)(JNIEnv * env, jobject self, jl
 
 JNI_METHOD(void, MediaPlaybackCluster, readPlaybackStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -20139,7 +20139,7 @@ JNI_METHOD(void, MediaPlaybackCluster, readPlaybackStateAttribute)(JNIEnv * env,
 
 JNI_METHOD(void, MediaPlaybackCluster, readStartTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -20176,7 +20176,7 @@ JNI_METHOD(void, MediaPlaybackCluster, readStartTimeAttribute)(JNIEnv * env, job
 
 JNI_METHOD(void, MediaPlaybackCluster, readDurationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -20214,7 +20214,7 @@ JNI_METHOD(void, MediaPlaybackCluster, readDurationAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, MediaPlaybackCluster, readPositionUpdatedAtAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -20251,7 +20251,7 @@ JNI_METHOD(void, MediaPlaybackCluster, readPositionUpdatedAtAttribute)
 
 JNI_METHOD(void, MediaPlaybackCluster, readPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -20288,7 +20288,7 @@ JNI_METHOD(void, MediaPlaybackCluster, readPositionAttribute)(JNIEnv * env, jobj
 
 JNI_METHOD(void, MediaPlaybackCluster, readPlaybackSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -20325,7 +20325,7 @@ JNI_METHOD(void, MediaPlaybackCluster, readPlaybackSpeedAttribute)(JNIEnv * env,
 
 JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeEndAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -20362,7 +20362,7 @@ JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeEndAttribute)(JNIEnv * env,
 
 JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeStartAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -20399,7 +20399,7 @@ JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeStartAttribute)(JNIEnv * env
 
 JNI_METHOD(void, MediaPlaybackCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -20435,7 +20435,7 @@ JNI_METHOD(void, MediaPlaybackCluster, readClusterRevisionAttribute)(JNIEnv * en
 }
 JNI_METHOD(jlong, NetworkCommissioningCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     NetworkCommissioningCluster * cppCluster = new NetworkCommissioningCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -20445,7 +20445,7 @@ JNI_METHOD(jlong, NetworkCommissioningCluster, initWithDevice)(JNIEnv * env, job
 JNI_METHOD(void, NetworkCommissioningCluster, addThreadNetwork)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray operationalDataset, jlong breadcrumb, jlong timeoutMs)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
 
@@ -20495,7 +20495,7 @@ JNI_METHOD(void, NetworkCommissioningCluster, addWiFiNetwork)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jbyteArray credentials, jlong breadcrumb,
  jlong timeoutMs)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
 
@@ -20545,7 +20545,7 @@ JNI_METHOD(void, NetworkCommissioningCluster, addWiFiNetwork)
 JNI_METHOD(void, NetworkCommissioningCluster, disableNetwork)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
 
@@ -20594,7 +20594,7 @@ JNI_METHOD(void, NetworkCommissioningCluster, disableNetwork)
 JNI_METHOD(void, NetworkCommissioningCluster, enableNetwork)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
 
@@ -20643,7 +20643,7 @@ JNI_METHOD(void, NetworkCommissioningCluster, enableNetwork)
 JNI_METHOD(void, NetworkCommissioningCluster, getLastNetworkCommissioningResult)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong timeoutMs)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
 
@@ -20689,7 +20689,7 @@ JNI_METHOD(void, NetworkCommissioningCluster, getLastNetworkCommissioningResult)
 JNI_METHOD(void, NetworkCommissioningCluster, removeNetwork)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
 
@@ -20738,7 +20738,7 @@ JNI_METHOD(void, NetworkCommissioningCluster, removeNetwork)
 JNI_METHOD(void, NetworkCommissioningCluster, scanNetworks)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jlong breadcrumb, jlong timeoutMs)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
 
@@ -20786,7 +20786,7 @@ JNI_METHOD(void, NetworkCommissioningCluster, scanNetworks)
 JNI_METHOD(void, NetworkCommissioningCluster, updateThreadNetwork)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray operationalDataset, jlong breadcrumb, jlong timeoutMs)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
 
@@ -20836,7 +20836,7 @@ JNI_METHOD(void, NetworkCommissioningCluster, updateWiFiNetwork)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jbyteArray credentials, jlong breadcrumb,
  jlong timeoutMs)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
 
@@ -20887,7 +20887,7 @@ JNI_METHOD(void, NetworkCommissioningCluster, updateWiFiNetwork)
 JNI_METHOD(void, NetworkCommissioningCluster, readFeatureMapAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -20925,7 +20925,7 @@ JNI_METHOD(void, NetworkCommissioningCluster, readFeatureMapAttribute)
 JNI_METHOD(void, NetworkCommissioningCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -20961,7 +20961,7 @@ JNI_METHOD(void, NetworkCommissioningCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, OtaSoftwareUpdateProviderCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     OtaSoftwareUpdateProviderCluster * cppCluster = new OtaSoftwareUpdateProviderCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -20971,7 +20971,7 @@ JNI_METHOD(jlong, OtaSoftwareUpdateProviderCluster, initWithDevice)(JNIEnv * env
 JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, applyUpdateRequest)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray updateToken, jlong newVersion)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateProviderCluster * cppCluster;
 
@@ -21020,7 +21020,7 @@ JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, applyUpdateRequest)
 JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, notifyUpdateApplied)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray updateToken, jlong softwareVersion)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateProviderCluster * cppCluster;
 
@@ -21070,7 +21070,7 @@ JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, queryImage)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint vendorId, jint productId, jint hardwareVersion,
  jlong softwareVersion, jint protocolsSupported, jstring location, jboolean requestorCanConsent, jbyteArray metadataForProvider)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateProviderCluster * cppCluster;
 
@@ -21122,7 +21122,7 @@ JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, queryImage)
 JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -21158,7 +21158,7 @@ JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, OtaSoftwareUpdateRequestorCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     OtaSoftwareUpdateRequestorCluster * cppCluster = new OtaSoftwareUpdateRequestorCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -21169,7 +21169,7 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray providerLocation, jint vendorId,
  jint announcementReason, jbyteArray metadataForNode)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster;
 
@@ -21221,7 +21221,7 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)
 JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readDefaultOtaProviderAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPOctetStringAttributeCallback * onSuccess = new CHIPOctetStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -21259,7 +21259,7 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readDefaultOtaProviderAttrib
 JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProviderAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -21299,7 +21299,7 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProviderAttri
 JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readUpdatePossibleAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -21337,7 +21337,7 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readUpdatePossibleAttribute)
 JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -21373,7 +21373,7 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readClusterRevisionAttribute
 }
 JNI_METHOD(jlong, OccupancySensingCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     OccupancySensingCluster * cppCluster = new OccupancySensingCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -21382,7 +21382,7 @@ JNI_METHOD(jlong, OccupancySensingCluster, initWithDevice)(JNIEnv * env, jobject
 
 JNI_METHOD(void, OccupancySensingCluster, readOccupancyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -21420,7 +21420,7 @@ JNI_METHOD(void, OccupancySensingCluster, readOccupancyAttribute)(JNIEnv * env,
 JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -21458,7 +21458,7 @@ JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeAttribute)
 JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeBitmapAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -21496,7 +21496,7 @@ JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeBitmapAttribute
 JNI_METHOD(void, OccupancySensingCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -21532,7 +21532,7 @@ JNI_METHOD(void, OccupancySensingCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, OnOffCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     OnOffCluster * cppCluster = new OnOffCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -21541,7 +21541,7 @@ JNI_METHOD(jlong, OnOffCluster, initWithDevice)(JNIEnv * env, jobject self, jlon
 
 JNI_METHOD(void, OnOffCluster, off)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
 
@@ -21587,7 +21587,7 @@ JNI_METHOD(void, OnOffCluster, off)(JNIEnv * env, jobject self, jlong clusterPtr
 JNI_METHOD(void, OnOffCluster, offWithEffect)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint effectId, jint effectVariant)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
 
@@ -21632,7 +21632,7 @@ JNI_METHOD(void, OnOffCluster, offWithEffect)
 }
 JNI_METHOD(void, OnOffCluster, on)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
 
@@ -21677,7 +21677,7 @@ JNI_METHOD(void, OnOffCluster, on)(JNIEnv * env, jobject self, jlong clusterPtr,
 }
 JNI_METHOD(void, OnOffCluster, onWithRecallGlobalScene)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
 
@@ -21723,7 +21723,7 @@ JNI_METHOD(void, OnOffCluster, onWithRecallGlobalScene)(JNIEnv * env, jobject se
 JNI_METHOD(void, OnOffCluster, onWithTimedOff)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint onOffControl, jint onTime, jint offWaitTime)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
 
@@ -21768,7 +21768,7 @@ JNI_METHOD(void, OnOffCluster, onWithTimedOff)
 }
 JNI_METHOD(void, OnOffCluster, toggle)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
 
@@ -21814,7 +21814,7 @@ JNI_METHOD(void, OnOffCluster, toggle)(JNIEnv * env, jobject self, jlong cluster
 
 JNI_METHOD(void, OnOffCluster, readOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -21851,7 +21851,7 @@ JNI_METHOD(void, OnOffCluster, readOnOffAttribute)(JNIEnv * env, jobject self, j
 
 JNI_METHOD(void, OnOffCluster, readGlobalSceneControlAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -21888,7 +21888,7 @@ JNI_METHOD(void, OnOffCluster, readGlobalSceneControlAttribute)(JNIEnv * env, jo
 
 JNI_METHOD(void, OnOffCluster, readOnTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -21925,7 +21925,7 @@ JNI_METHOD(void, OnOffCluster, readOnTimeAttribute)(JNIEnv * env, jobject self,
 
 JNI_METHOD(void, OnOffCluster, writeOnTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -21962,7 +21962,7 @@ JNI_METHOD(void, OnOffCluster, writeOnTimeAttribute)(JNIEnv * env, jobject self,
 
 JNI_METHOD(void, OnOffCluster, readOffWaitTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -22000,7 +22000,7 @@ JNI_METHOD(void, OnOffCluster, readOffWaitTimeAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -22037,7 +22037,7 @@ JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)
 
 JNI_METHOD(void, OnOffCluster, readStartUpOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -22075,7 +22075,7 @@ JNI_METHOD(void, OnOffCluster, readStartUpOnOffAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -22112,7 +22112,7 @@ JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)
 
 JNI_METHOD(void, OnOffCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -22149,7 +22149,7 @@ JNI_METHOD(void, OnOffCluster, readFeatureMapAttribute)(JNIEnv * env, jobject se
 
 JNI_METHOD(void, OnOffCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -22185,7 +22185,7 @@ JNI_METHOD(void, OnOffCluster, readClusterRevisionAttribute)(JNIEnv * env, jobje
 }
 JNI_METHOD(jlong, OnOffSwitchConfigurationCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     OnOffSwitchConfigurationCluster * cppCluster = new OnOffSwitchConfigurationCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -22195,7 +22195,7 @@ JNI_METHOD(jlong, OnOffSwitchConfigurationCluster, initWithDevice)(JNIEnv * env,
 JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchTypeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -22233,7 +22233,7 @@ JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchTypeAttribute)
 JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchActionsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -22271,7 +22271,7 @@ JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchActionsAttribute)
 JNI_METHOD(void, OnOffSwitchConfigurationCluster, writeSwitchActionsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -22309,7 +22309,7 @@ JNI_METHOD(void, OnOffSwitchConfigurationCluster, writeSwitchActionsAttribute)
 JNI_METHOD(void, OnOffSwitchConfigurationCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -22345,7 +22345,7 @@ JNI_METHOD(void, OnOffSwitchConfigurationCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, OperationalCredentialsCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     OperationalCredentialsCluster * cppCluster = new OperationalCredentialsCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -22356,7 +22356,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, addNOC)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray nOCValue, jbyteArray iCACValue, jbyteArray iPKValue,
  jlong caseAdminNode, jint adminVendorId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
 
@@ -22408,7 +22408,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, addNOC)
 JNI_METHOD(void, OperationalCredentialsCluster, addTrustedRootCertificate)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray rootCertificate)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
 
@@ -22457,7 +22457,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, addTrustedRootCertificate)
 JNI_METHOD(void, OperationalCredentialsCluster, attestationRequest)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray attestationNonce)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
 
@@ -22505,7 +22505,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, attestationRequest)
 JNI_METHOD(void, OperationalCredentialsCluster, certificateChainRequest)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint certificateType)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
 
@@ -22551,7 +22551,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, certificateChainRequest)
 JNI_METHOD(void, OperationalCredentialsCluster, opCSRRequest)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray cSRNonce)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
 
@@ -22599,7 +22599,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, opCSRRequest)
 JNI_METHOD(void, OperationalCredentialsCluster, removeFabric)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint fabricIndex)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
 
@@ -22645,7 +22645,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, removeFabric)
 JNI_METHOD(void, OperationalCredentialsCluster, removeTrustedRootCertificate)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray trustedRootIdentifier)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
 
@@ -22694,7 +22694,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, removeTrustedRootCertificate)
 JNI_METHOD(void, OperationalCredentialsCluster, updateFabricLabel)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring label)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
 
@@ -22742,7 +22742,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, updateFabricLabel)
 JNI_METHOD(void, OperationalCredentialsCluster, updateNOC)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray nOCValue, jbyteArray iCACValue)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
 
@@ -22793,7 +22793,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, updateNOC)
 JNI_METHOD(void, OperationalCredentialsCluster, readFabricsListAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPOperationalCredentialsFabricsListAttributeCallback * onSuccess =
         new CHIPOperationalCredentialsFabricsListAttributeCallback(callback);
     if (!onSuccess)
@@ -22832,7 +22832,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, readFabricsListAttribute)
 JNI_METHOD(void, OperationalCredentialsCluster, readSupportedFabricsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -22870,7 +22870,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, readSupportedFabricsAttribute)
 JNI_METHOD(void, OperationalCredentialsCluster, readCommissionedFabricsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -22908,7 +22908,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, readCommissionedFabricsAttribute
 JNI_METHOD(void, OperationalCredentialsCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -22944,7 +22944,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, PowerSourceCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     PowerSourceCluster * cppCluster = new PowerSourceCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -22953,7 +22953,7 @@ JNI_METHOD(jlong, PowerSourceCluster, initWithDevice)(JNIEnv * env, jobject self
 
 JNI_METHOD(void, PowerSourceCluster, readStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -22990,7 +22990,7 @@ JNI_METHOD(void, PowerSourceCluster, readStatusAttribute)(JNIEnv * env, jobject
 
 JNI_METHOD(void, PowerSourceCluster, readOrderAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23027,7 +23027,7 @@ JNI_METHOD(void, PowerSourceCluster, readOrderAttribute)(JNIEnv * env, jobject s
 
 JNI_METHOD(void, PowerSourceCluster, readDescriptionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23064,7 +23064,7 @@ JNI_METHOD(void, PowerSourceCluster, readDescriptionAttribute)(JNIEnv * env, job
 
 JNI_METHOD(void, PowerSourceCluster, readBatteryVoltageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23102,7 +23102,7 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryVoltageAttribute)(JNIEnv * env,
 JNI_METHOD(void, PowerSourceCluster, readBatteryPercentRemainingAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23140,7 +23140,7 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryPercentRemainingAttribute)
 JNI_METHOD(void, PowerSourceCluster, readBatteryTimeRemainingAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23178,7 +23178,7 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryTimeRemainingAttribute)
 JNI_METHOD(void, PowerSourceCluster, readBatteryChargeLevelAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23216,7 +23216,7 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryChargeLevelAttribute)
 JNI_METHOD(void, PowerSourceCluster, readActiveBatteryFaultsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPPowerSourceActiveBatteryFaultsAttributeCallback * onSuccess =
         new CHIPPowerSourceActiveBatteryFaultsAttributeCallback(callback);
     if (!onSuccess)
@@ -23255,7 +23255,7 @@ JNI_METHOD(void, PowerSourceCluster, readActiveBatteryFaultsAttribute)
 JNI_METHOD(void, PowerSourceCluster, readBatteryChargeStateAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23292,7 +23292,7 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryChargeStateAttribute)
 
 JNI_METHOD(void, PowerSourceCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23329,7 +23329,7 @@ JNI_METHOD(void, PowerSourceCluster, readFeatureMapAttribute)(JNIEnv * env, jobj
 
 JNI_METHOD(void, PowerSourceCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23365,7 +23365,7 @@ JNI_METHOD(void, PowerSourceCluster, readClusterRevisionAttribute)(JNIEnv * env,
 }
 JNI_METHOD(jlong, PressureMeasurementCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     PressureMeasurementCluster * cppCluster = new PressureMeasurementCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -23375,7 +23375,7 @@ JNI_METHOD(jlong, PressureMeasurementCluster, initWithDevice)(JNIEnv * env, jobj
 JNI_METHOD(void, PressureMeasurementCluster, readMeasuredValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23413,7 +23413,7 @@ JNI_METHOD(void, PressureMeasurementCluster, readMeasuredValueAttribute)
 JNI_METHOD(void, PressureMeasurementCluster, readMinMeasuredValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23451,7 +23451,7 @@ JNI_METHOD(void, PressureMeasurementCluster, readMinMeasuredValueAttribute)
 JNI_METHOD(void, PressureMeasurementCluster, readMaxMeasuredValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23489,7 +23489,7 @@ JNI_METHOD(void, PressureMeasurementCluster, readMaxMeasuredValueAttribute)
 JNI_METHOD(void, PressureMeasurementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23525,7 +23525,7 @@ JNI_METHOD(void, PressureMeasurementCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, PumpConfigurationAndControlCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     PumpConfigurationAndControlCluster * cppCluster = new PumpConfigurationAndControlCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -23535,7 +23535,7 @@ JNI_METHOD(jlong, PumpConfigurationAndControlCluster, initWithDevice)(JNIEnv * e
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxPressureAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23573,7 +23573,7 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxPressureAttribute)
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxSpeedAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23611,7 +23611,7 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxSpeedAttribute)
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxFlowAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23649,7 +23649,7 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxFlowAttribute)
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveOperationModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23687,7 +23687,7 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveOperationModeA
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveControlModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23725,7 +23725,7 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveControlModeAtt
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readCapacityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23763,7 +23763,7 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readCapacityAttribute)
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readOperationModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23801,7 +23801,7 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readOperationModeAttribute)
 JNI_METHOD(void, PumpConfigurationAndControlCluster, writeOperationModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -23839,7 +23839,7 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, writeOperationModeAttribute
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23875,7 +23875,7 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readClusterRevisionAttribut
 }
 JNI_METHOD(jlong, RelativeHumidityMeasurementCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     RelativeHumidityMeasurementCluster * cppCluster = new RelativeHumidityMeasurementCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -23885,7 +23885,7 @@ JNI_METHOD(jlong, RelativeHumidityMeasurementCluster, initWithDevice)(JNIEnv * e
 JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMeasuredValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23923,7 +23923,7 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMeasuredValueAttribute)
 JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMinMeasuredValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23961,7 +23961,7 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMinMeasuredValueAttribu
 JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMaxMeasuredValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -23999,7 +23999,7 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMaxMeasuredValueAttribu
 JNI_METHOD(void, RelativeHumidityMeasurementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24035,7 +24035,7 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readClusterRevisionAttribut
 }
 JNI_METHOD(jlong, ScenesCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ScenesCluster * cppCluster = new ScenesCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -24046,7 +24046,7 @@ JNI_METHOD(void, ScenesCluster, addScene)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId, jint transitionTime, jstring sceneName,
  jlong clusterId, jint length, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
 
@@ -24093,7 +24093,7 @@ JNI_METHOD(void, ScenesCluster, addScene)
 }
 JNI_METHOD(void, ScenesCluster, getSceneMembership)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
 
@@ -24139,7 +24139,7 @@ JNI_METHOD(void, ScenesCluster, getSceneMembership)(JNIEnv * env, jobject self,
 JNI_METHOD(void, ScenesCluster, recallScene)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId, jint transitionTime)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
 
@@ -24184,7 +24184,7 @@ JNI_METHOD(void, ScenesCluster, recallScene)
 }
 JNI_METHOD(void, ScenesCluster, removeAllScenes)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
 
@@ -24230,7 +24230,7 @@ JNI_METHOD(void, ScenesCluster, removeAllScenes)(JNIEnv * env, jobject self, jlo
 JNI_METHOD(void, ScenesCluster, removeScene)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
 
@@ -24276,7 +24276,7 @@ JNI_METHOD(void, ScenesCluster, removeScene)
 JNI_METHOD(void, ScenesCluster, storeScene)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
 
@@ -24322,7 +24322,7 @@ JNI_METHOD(void, ScenesCluster, storeScene)
 JNI_METHOD(void, ScenesCluster, viewScene)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
 
@@ -24368,7 +24368,7 @@ JNI_METHOD(void, ScenesCluster, viewScene)
 
 JNI_METHOD(void, ScenesCluster, readSceneCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24405,7 +24405,7 @@ JNI_METHOD(void, ScenesCluster, readSceneCountAttribute)(JNIEnv * env, jobject s
 
 JNI_METHOD(void, ScenesCluster, readCurrentSceneAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24442,7 +24442,7 @@ JNI_METHOD(void, ScenesCluster, readCurrentSceneAttribute)(JNIEnv * env, jobject
 
 JNI_METHOD(void, ScenesCluster, readCurrentGroupAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24479,7 +24479,7 @@ JNI_METHOD(void, ScenesCluster, readCurrentGroupAttribute)(JNIEnv * env, jobject
 
 JNI_METHOD(void, ScenesCluster, readSceneValidAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24516,7 +24516,7 @@ JNI_METHOD(void, ScenesCluster, readSceneValidAttribute)(JNIEnv * env, jobject s
 
 JNI_METHOD(void, ScenesCluster, readNameSupportAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24553,7 +24553,7 @@ JNI_METHOD(void, ScenesCluster, readNameSupportAttribute)(JNIEnv * env, jobject
 
 JNI_METHOD(void, ScenesCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24589,7 +24589,7 @@ JNI_METHOD(void, ScenesCluster, readClusterRevisionAttribute)(JNIEnv * env, jobj
 }
 JNI_METHOD(jlong, SoftwareDiagnosticsCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     SoftwareDiagnosticsCluster * cppCluster = new SoftwareDiagnosticsCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -24598,7 +24598,7 @@ JNI_METHOD(jlong, SoftwareDiagnosticsCluster, initWithDevice)(JNIEnv * env, jobj
 
 JNI_METHOD(void, SoftwareDiagnosticsCluster, resetWatermarks)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     SoftwareDiagnosticsCluster * cppCluster;
 
@@ -24645,7 +24645,7 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, resetWatermarks)(JNIEnv * env, jobj
 JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapFreeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24683,7 +24683,7 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapFreeAttribute)
 JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapUsedAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24721,7 +24721,7 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapUsedAttribute)
 JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapHighWatermarkAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24759,7 +24759,7 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapHighWatermarkAttribu
 JNI_METHOD(void, SoftwareDiagnosticsCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24795,7 +24795,7 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, SwitchCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     SwitchCluster * cppCluster = new SwitchCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -24804,7 +24804,7 @@ JNI_METHOD(jlong, SwitchCluster, initWithDevice)(JNIEnv * env, jobject self, jlo
 
 JNI_METHOD(void, SwitchCluster, readNumberOfPositionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24841,7 +24841,7 @@ JNI_METHOD(void, SwitchCluster, readNumberOfPositionsAttribute)(JNIEnv * env, jo
 
 JNI_METHOD(void, SwitchCluster, readCurrentPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24878,7 +24878,7 @@ JNI_METHOD(void, SwitchCluster, readCurrentPositionAttribute)(JNIEnv * env, jobj
 
 JNI_METHOD(void, SwitchCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -24914,7 +24914,7 @@ JNI_METHOD(void, SwitchCluster, readClusterRevisionAttribute)(JNIEnv * env, jobj
 }
 JNI_METHOD(jlong, TvChannelCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     TvChannelCluster * cppCluster = new TvChannelCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -24923,7 +24923,7 @@ JNI_METHOD(jlong, TvChannelCluster, initWithDevice)(JNIEnv * env, jobject self,
 
 JNI_METHOD(void, TvChannelCluster, changeChannel)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring match)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster;
 
@@ -24971,7 +24971,7 @@ JNI_METHOD(void, TvChannelCluster, changeChannel)(JNIEnv * env, jobject self, jl
 JNI_METHOD(void, TvChannelCluster, changeChannelByNumber)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint majorNumber, jint minorNumber)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster;
 
@@ -25016,7 +25016,7 @@ JNI_METHOD(void, TvChannelCluster, changeChannelByNumber)
 }
 JNI_METHOD(void, TvChannelCluster, skipChannel)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint count)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster;
 
@@ -25062,7 +25062,7 @@ JNI_METHOD(void, TvChannelCluster, skipChannel)(JNIEnv * env, jobject self, jlon
 
 JNI_METHOD(void, TvChannelCluster, readTvChannelListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPTvChannelTvChannelListAttributeCallback * onSuccess = new CHIPTvChannelTvChannelListAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25099,7 +25099,7 @@ JNI_METHOD(void, TvChannelCluster, readTvChannelListAttribute)(JNIEnv * env, job
 
 JNI_METHOD(void, TvChannelCluster, readTvChannelLineupAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPOctetStringAttributeCallback * onSuccess = new CHIPOctetStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25136,7 +25136,7 @@ JNI_METHOD(void, TvChannelCluster, readTvChannelLineupAttribute)(JNIEnv * env, j
 
 JNI_METHOD(void, TvChannelCluster, readCurrentTvChannelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPOctetStringAttributeCallback * onSuccess = new CHIPOctetStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25173,7 +25173,7 @@ JNI_METHOD(void, TvChannelCluster, readCurrentTvChannelAttribute)(JNIEnv * env,
 
 JNI_METHOD(void, TvChannelCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25209,7 +25209,7 @@ JNI_METHOD(void, TvChannelCluster, readClusterRevisionAttribute)(JNIEnv * env, j
 }
 JNI_METHOD(jlong, TargetNavigatorCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     TargetNavigatorCluster * cppCluster = new TargetNavigatorCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -25219,7 +25219,7 @@ JNI_METHOD(jlong, TargetNavigatorCluster, initWithDevice)(JNIEnv * env, jobject
 JNI_METHOD(void, TargetNavigatorCluster, navigateTarget)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint target, jstring data)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TargetNavigatorCluster * cppCluster;
 
@@ -25268,7 +25268,7 @@ JNI_METHOD(void, TargetNavigatorCluster, navigateTarget)
 JNI_METHOD(void, TargetNavigatorCluster, readTargetNavigatorListAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPTargetNavigatorTargetNavigatorListAttributeCallback * onSuccess =
         new CHIPTargetNavigatorTargetNavigatorListAttributeCallback(callback);
     if (!onSuccess)
@@ -25307,7 +25307,7 @@ JNI_METHOD(void, TargetNavigatorCluster, readTargetNavigatorListAttribute)
 JNI_METHOD(void, TargetNavigatorCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25343,7 +25343,7 @@ JNI_METHOD(void, TargetNavigatorCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, TemperatureMeasurementCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     TemperatureMeasurementCluster * cppCluster = new TemperatureMeasurementCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -25353,7 +25353,7 @@ JNI_METHOD(jlong, TemperatureMeasurementCluster, initWithDevice)(JNIEnv * env, j
 JNI_METHOD(void, TemperatureMeasurementCluster, readMeasuredValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25391,7 +25391,7 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readMeasuredValueAttribute)
 JNI_METHOD(void, TemperatureMeasurementCluster, readMinMeasuredValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25429,7 +25429,7 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readMinMeasuredValueAttribute)
 JNI_METHOD(void, TemperatureMeasurementCluster, readMaxMeasuredValueAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25467,7 +25467,7 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readMaxMeasuredValueAttribute)
 JNI_METHOD(void, TemperatureMeasurementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25503,7 +25503,7 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, TestClusterCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     TestClusterCluster * cppCluster = new TestClusterCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -25512,7 +25512,7 @@ JNI_METHOD(jlong, TestClusterCluster, initWithDevice)(JNIEnv * env, jobject self
 
 JNI_METHOD(void, TestClusterCluster, test)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
 
@@ -25558,7 +25558,7 @@ JNI_METHOD(void, TestClusterCluster, test)(JNIEnv * env, jobject self, jlong clu
 JNI_METHOD(void, TestClusterCluster, testAddArguments)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1, jint arg2)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
 
@@ -25603,7 +25603,7 @@ JNI_METHOD(void, TestClusterCluster, testAddArguments)
 }
 JNI_METHOD(void, TestClusterCluster, testNotHandled)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
 
@@ -25648,7 +25648,7 @@ JNI_METHOD(void, TestClusterCluster, testNotHandled)(JNIEnv * env, jobject self,
 }
 JNI_METHOD(void, TestClusterCluster, testSpecific)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
 
@@ -25693,7 +25693,7 @@ JNI_METHOD(void, TestClusterCluster, testSpecific)(JNIEnv * env, jobject self, j
 }
 JNI_METHOD(void, TestClusterCluster, testUnknownCommand)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
 
@@ -25739,7 +25739,7 @@ JNI_METHOD(void, TestClusterCluster, testUnknownCommand)(JNIEnv * env, jobject s
 
 JNI_METHOD(void, TestClusterCluster, readBooleanAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25777,7 +25777,7 @@ JNI_METHOD(void, TestClusterCluster, readBooleanAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, writeBooleanAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -25814,7 +25814,7 @@ JNI_METHOD(void, TestClusterCluster, writeBooleanAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readBitmap8Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25852,7 +25852,7 @@ JNI_METHOD(void, TestClusterCluster, readBitmap8Attribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -25889,7 +25889,7 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)
 
 JNI_METHOD(void, TestClusterCluster, readBitmap16Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -25927,7 +25927,7 @@ JNI_METHOD(void, TestClusterCluster, readBitmap16Attribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -25964,7 +25964,7 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)
 
 JNI_METHOD(void, TestClusterCluster, readBitmap32Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26002,7 +26002,7 @@ JNI_METHOD(void, TestClusterCluster, readBitmap32Attribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26039,7 +26039,7 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)
 
 JNI_METHOD(void, TestClusterCluster, readBitmap64Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26077,7 +26077,7 @@ JNI_METHOD(void, TestClusterCluster, readBitmap64Attribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26114,7 +26114,7 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)
 
 JNI_METHOD(void, TestClusterCluster, readInt8uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26152,7 +26152,7 @@ JNI_METHOD(void, TestClusterCluster, readInt8uAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26189,7 +26189,7 @@ JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readInt16uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26227,7 +26227,7 @@ JNI_METHOD(void, TestClusterCluster, readInt16uAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26264,7 +26264,7 @@ JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readInt32uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26302,7 +26302,7 @@ JNI_METHOD(void, TestClusterCluster, readInt32uAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26339,7 +26339,7 @@ JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readInt64uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26377,7 +26377,7 @@ JNI_METHOD(void, TestClusterCluster, readInt64uAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26414,7 +26414,7 @@ JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readInt8sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8sAttributeCallback * onSuccess = new CHIPInt8sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26452,7 +26452,7 @@ JNI_METHOD(void, TestClusterCluster, readInt8sAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26489,7 +26489,7 @@ JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readInt16sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26527,7 +26527,7 @@ JNI_METHOD(void, TestClusterCluster, readInt16sAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26564,7 +26564,7 @@ JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readInt32sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32sAttributeCallback * onSuccess = new CHIPInt32sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26602,7 +26602,7 @@ JNI_METHOD(void, TestClusterCluster, readInt32sAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26639,7 +26639,7 @@ JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readInt64sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64sAttributeCallback * onSuccess = new CHIPInt64sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26677,7 +26677,7 @@ JNI_METHOD(void, TestClusterCluster, readInt64sAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, writeInt64sAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26714,7 +26714,7 @@ JNI_METHOD(void, TestClusterCluster, writeInt64sAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readEnum8Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26752,7 +26752,7 @@ JNI_METHOD(void, TestClusterCluster, readEnum8Attribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, TestClusterCluster, writeEnum8Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26789,7 +26789,7 @@ JNI_METHOD(void, TestClusterCluster, writeEnum8Attribute)
 
 JNI_METHOD(void, TestClusterCluster, readEnum16Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26827,7 +26827,7 @@ JNI_METHOD(void, TestClusterCluster, readEnum16Attribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, writeEnum16Attribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26864,7 +26864,7 @@ JNI_METHOD(void, TestClusterCluster, writeEnum16Attribute)
 
 JNI_METHOD(void, TestClusterCluster, readOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPOctetStringAttributeCallback * onSuccess = new CHIPOctetStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26902,7 +26902,7 @@ JNI_METHOD(void, TestClusterCluster, readOctetStringAttribute)(JNIEnv * env, job
 JNI_METHOD(void, TestClusterCluster, writeOctetStringAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -26941,7 +26941,7 @@ JNI_METHOD(void, TestClusterCluster, writeOctetStringAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readListInt8uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPTestClusterListInt8uAttributeCallback * onSuccess = new CHIPTestClusterListInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -26978,7 +26978,7 @@ JNI_METHOD(void, TestClusterCluster, readListInt8uAttribute)(JNIEnv * env, jobje
 
 JNI_METHOD(void, TestClusterCluster, readListOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPTestClusterListOctetStringAttributeCallback * onSuccess = new CHIPTestClusterListOctetStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27016,7 +27016,7 @@ JNI_METHOD(void, TestClusterCluster, readListOctetStringAttribute)(JNIEnv * env,
 JNI_METHOD(void, TestClusterCluster, readListStructOctetStringAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPTestClusterListStructOctetStringAttributeCallback * onSuccess =
         new CHIPTestClusterListStructOctetStringAttributeCallback(callback);
     if (!onSuccess)
@@ -27054,7 +27054,7 @@ JNI_METHOD(void, TestClusterCluster, readListStructOctetStringAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readLongOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPOctetStringAttributeCallback * onSuccess = new CHIPOctetStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27092,7 +27092,7 @@ JNI_METHOD(void, TestClusterCluster, readLongOctetStringAttribute)(JNIEnv * env,
 JNI_METHOD(void, TestClusterCluster, writeLongOctetStringAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -27131,7 +27131,7 @@ JNI_METHOD(void, TestClusterCluster, writeLongOctetStringAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readCharStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27169,7 +27169,7 @@ JNI_METHOD(void, TestClusterCluster, readCharStringAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -27208,7 +27208,7 @@ JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readLongCharStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27246,7 +27246,7 @@ JNI_METHOD(void, TestClusterCluster, readLongCharStringAttribute)(JNIEnv * env,
 JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -27285,7 +27285,7 @@ JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readEpochUsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27323,7 +27323,7 @@ JNI_METHOD(void, TestClusterCluster, readEpochUsAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, writeEpochUsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -27360,7 +27360,7 @@ JNI_METHOD(void, TestClusterCluster, writeEpochUsAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readEpochSAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27398,7 +27398,7 @@ JNI_METHOD(void, TestClusterCluster, readEpochSAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, writeEpochSAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -27435,7 +27435,7 @@ JNI_METHOD(void, TestClusterCluster, writeEpochSAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readUnsupportedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPBooleanAttributeCallback * onSuccess = new CHIPBooleanAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27473,7 +27473,7 @@ JNI_METHOD(void, TestClusterCluster, readUnsupportedAttribute)(JNIEnv * env, job
 JNI_METHOD(void, TestClusterCluster, writeUnsupportedAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -27510,7 +27510,7 @@ JNI_METHOD(void, TestClusterCluster, writeUnsupportedAttribute)
 
 JNI_METHOD(void, TestClusterCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27546,7 +27546,7 @@ JNI_METHOD(void, TestClusterCluster, readClusterRevisionAttribute)(JNIEnv * env,
 }
 JNI_METHOD(jlong, ThermostatCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ThermostatCluster * cppCluster = new ThermostatCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -27555,7 +27555,7 @@ JNI_METHOD(jlong, ThermostatCluster, initWithDevice)(JNIEnv * env, jobject self,
 
 JNI_METHOD(void, ThermostatCluster, clearWeeklySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
 
@@ -27600,7 +27600,7 @@ JNI_METHOD(void, ThermostatCluster, clearWeeklySchedule)(JNIEnv * env, jobject s
 }
 JNI_METHOD(void, ThermostatCluster, getRelayStatusLog)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
 
@@ -27646,7 +27646,7 @@ JNI_METHOD(void, ThermostatCluster, getRelayStatusLog)(JNIEnv * env, jobject sel
 JNI_METHOD(void, ThermostatCluster, getWeeklySchedule)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint daysToReturn, jint modeToReturn)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
 
@@ -27693,7 +27693,7 @@ JNI_METHOD(void, ThermostatCluster, setWeeklySchedule)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint numberOfTransitionsForSequence, jint dayOfWeekForSequence,
  jint modeForSequence, jint payload)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
 
@@ -27740,7 +27740,7 @@ JNI_METHOD(void, ThermostatCluster, setWeeklySchedule)
 JNI_METHOD(void, ThermostatCluster, setpointRaiseLower)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint mode, jint amount)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
 
@@ -27786,7 +27786,7 @@ JNI_METHOD(void, ThermostatCluster, setpointRaiseLower)
 
 JNI_METHOD(void, ThermostatCluster, readLocalTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27824,7 +27824,7 @@ JNI_METHOD(void, ThermostatCluster, readLocalTemperatureAttribute)(JNIEnv * env,
 JNI_METHOD(void, ThermostatCluster, readAbsMinHeatSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27862,7 +27862,7 @@ JNI_METHOD(void, ThermostatCluster, readAbsMinHeatSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, readAbsMaxHeatSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27900,7 +27900,7 @@ JNI_METHOD(void, ThermostatCluster, readAbsMaxHeatSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, readAbsMinCoolSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27938,7 +27938,7 @@ JNI_METHOD(void, ThermostatCluster, readAbsMinCoolSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, readAbsMaxCoolSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -27976,7 +27976,7 @@ JNI_METHOD(void, ThermostatCluster, readAbsMaxCoolSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, readOccupiedCoolingSetpointAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28014,7 +28014,7 @@ JNI_METHOD(void, ThermostatCluster, readOccupiedCoolingSetpointAttribute)
 JNI_METHOD(void, ThermostatCluster, writeOccupiedCoolingSetpointAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -28052,7 +28052,7 @@ JNI_METHOD(void, ThermostatCluster, writeOccupiedCoolingSetpointAttribute)
 JNI_METHOD(void, ThermostatCluster, readOccupiedHeatingSetpointAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28090,7 +28090,7 @@ JNI_METHOD(void, ThermostatCluster, readOccupiedHeatingSetpointAttribute)
 JNI_METHOD(void, ThermostatCluster, writeOccupiedHeatingSetpointAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -28128,7 +28128,7 @@ JNI_METHOD(void, ThermostatCluster, writeOccupiedHeatingSetpointAttribute)
 JNI_METHOD(void, ThermostatCluster, readMinHeatSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28166,7 +28166,7 @@ JNI_METHOD(void, ThermostatCluster, readMinHeatSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, writeMinHeatSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -28204,7 +28204,7 @@ JNI_METHOD(void, ThermostatCluster, writeMinHeatSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, readMaxHeatSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28242,7 +28242,7 @@ JNI_METHOD(void, ThermostatCluster, readMaxHeatSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, writeMaxHeatSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -28280,7 +28280,7 @@ JNI_METHOD(void, ThermostatCluster, writeMaxHeatSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, readMinCoolSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28318,7 +28318,7 @@ JNI_METHOD(void, ThermostatCluster, readMinCoolSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, writeMinCoolSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -28356,7 +28356,7 @@ JNI_METHOD(void, ThermostatCluster, writeMinCoolSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, readMaxCoolSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16sAttributeCallback * onSuccess = new CHIPInt16sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28394,7 +28394,7 @@ JNI_METHOD(void, ThermostatCluster, readMaxCoolSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, writeMaxCoolSetpointLimitAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -28432,7 +28432,7 @@ JNI_METHOD(void, ThermostatCluster, writeMaxCoolSetpointLimitAttribute)
 JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28470,7 +28470,7 @@ JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)
 JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -28508,7 +28508,7 @@ JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)
 
 JNI_METHOD(void, ThermostatCluster, readSystemModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28546,7 +28546,7 @@ JNI_METHOD(void, ThermostatCluster, readSystemModeAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -28583,7 +28583,7 @@ JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)
 
 JNI_METHOD(void, ThermostatCluster, readStartOfWeekAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28621,7 +28621,7 @@ JNI_METHOD(void, ThermostatCluster, readStartOfWeekAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ThermostatCluster, readNumberOfWeeklyTransitionsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28659,7 +28659,7 @@ JNI_METHOD(void, ThermostatCluster, readNumberOfWeeklyTransitionsAttribute)
 JNI_METHOD(void, ThermostatCluster, readNumberOfDailyTransitionsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28696,7 +28696,7 @@ JNI_METHOD(void, ThermostatCluster, readNumberOfDailyTransitionsAttribute)
 
 JNI_METHOD(void, ThermostatCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28733,7 +28733,7 @@ JNI_METHOD(void, ThermostatCluster, readFeatureMapAttribute)(JNIEnv * env, jobje
 
 JNI_METHOD(void, ThermostatCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28770,7 +28770,7 @@ JNI_METHOD(void, ThermostatCluster, readClusterRevisionAttribute)(JNIEnv * env,
 JNI_METHOD(jlong, ThermostatUserInterfaceConfigurationCluster, initWithDevice)
 (JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ThermostatUserInterfaceConfigurationCluster * cppCluster = new ThermostatUserInterfaceConfigurationCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -28780,7 +28780,7 @@ JNI_METHOD(jlong, ThermostatUserInterfaceConfigurationCluster, initWithDevice)
 JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readTemperatureDisplayModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28819,7 +28819,7 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readTemperatureDis
 JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeTemperatureDisplayModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -28858,7 +28858,7 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeTemperatureDi
 JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readKeypadLockoutAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28897,7 +28897,7 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readKeypadLockoutA
 JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeKeypadLockoutAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -28936,7 +28936,7 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeKeypadLockout
 JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readScheduleProgrammingVisibilityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -28975,7 +28975,7 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readScheduleProgra
 JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeScheduleProgrammingVisibilityAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -29015,7 +29015,7 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeScheduleProgr
 JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29052,7 +29052,7 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readClusterRevisio
 }
 JNI_METHOD(jlong, ThreadNetworkDiagnosticsCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     ThreadNetworkDiagnosticsCluster * cppCluster = new ThreadNetworkDiagnosticsCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -29061,7 +29061,7 @@ JNI_METHOD(jlong, ThreadNetworkDiagnosticsCluster, initWithDevice)(JNIEnv * env,
 
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster;
 
@@ -29108,7 +29108,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, job
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29146,7 +29146,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRoutingRoleAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29184,7 +29184,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRoutingRoleAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNetworkNameAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPOctetStringAttributeCallback * onSuccess = new CHIPOctetStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29222,7 +29222,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNetworkNameAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPanIdAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29260,7 +29260,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPanIdAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readExtendedPanIdAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29298,7 +29298,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readExtendedPanIdAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readMeshLocalPrefixAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPOctetStringAttributeCallback * onSuccess = new CHIPOctetStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29336,7 +29336,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readMeshLocalPrefixAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOverrunCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29374,7 +29374,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOverrunCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNeighborTableListAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback * onSuccess =
         new CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback(callback);
     if (!onSuccess)
@@ -29413,7 +29413,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNeighborTableListAttribute
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouteTableListAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback * onSuccess =
         new CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback(callback);
     if (!onSuccess)
@@ -29452,7 +29452,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouteTableListAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29490,7 +29490,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readWeightingAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29528,7 +29528,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readWeightingAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDataVersionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29566,7 +29566,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDataVersionAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readStableDataVersionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29604,7 +29604,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readStableDataVersionAttribute
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRouterIdAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29642,7 +29642,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRouterIdAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDetachedRoleCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29680,7 +29680,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDetachedRoleCountAttribute
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChildRoleCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29718,7 +29718,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChildRoleCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouterRoleCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29756,7 +29756,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouterRoleCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRoleCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29794,7 +29794,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRoleCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readAttachAttemptCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29832,7 +29832,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readAttachAttemptCountAttribut
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdChangeCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29870,7 +29870,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdChangeCountAttr
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readBetterPartitionAttachAttemptCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29908,7 +29908,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readBetterPartitionAttachAttem
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readParentChangeCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29946,7 +29946,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readParentChangeCountAttribute
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxTotalCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -29984,7 +29984,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxTotalCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxUnicastCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30022,7 +30022,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxUnicastCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBroadcastCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30060,7 +30060,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBroadcastCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckRequestedCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30098,7 +30098,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckRequestedCountAttribu
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckedCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30136,7 +30136,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckedCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxNoAckRequestedCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30174,7 +30174,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxNoAckRequestedCountAttri
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30212,7 +30212,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataPollCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30250,7 +30250,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataPollCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30288,7 +30288,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconRequestCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30326,7 +30326,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconRequestCountAttrib
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxOtherCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30364,7 +30364,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxOtherCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxRetryCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30402,7 +30402,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxRetryCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDirectMaxRetryExpiryCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30440,7 +30440,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDirectMaxRetryExpiryCoun
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxIndirectMaxRetryExpiryCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30478,7 +30478,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxIndirectMaxRetryExpiryCo
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrCcaCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30516,7 +30516,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrCcaCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrAbortCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30554,7 +30554,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrAbortCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrBusyChannelCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30592,7 +30592,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrBusyChannelCountAttri
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxTotalCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30630,7 +30630,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxTotalCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxUnicastCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30668,7 +30668,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxUnicastCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBroadcastCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30706,7 +30706,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBroadcastCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30744,7 +30744,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataPollCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30782,7 +30782,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataPollCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30820,7 +30820,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconRequestCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30858,7 +30858,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconRequestCountAttrib
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxOtherCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30896,7 +30896,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxOtherCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxAddressFilteredCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30934,7 +30934,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxAddressFilteredCountAttr
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDestAddrFilteredCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -30972,7 +30972,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDestAddrFilteredCountAtt
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDuplicatedCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31010,7 +31010,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDuplicatedCountAttribute
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrNoFrameCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31048,7 +31048,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrNoFrameCountAttribute
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrUnknownNeighborCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31086,7 +31086,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrUnknownNeighborCountA
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrInvalidSrcAddrCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31124,7 +31124,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrInvalidSrcAddrCountAt
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrSecCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31162,7 +31162,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrSecCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrFcsCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31200,7 +31200,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrFcsCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrOtherCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31238,7 +31238,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrOtherCountAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveTimestampAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31276,7 +31276,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveTimestampAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPendingTimestampAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31314,7 +31314,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPendingTimestampAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDelayAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31352,7 +31352,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDelayAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readSecurityPolicyAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback * onSuccess =
         new CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback(callback);
     if (!onSuccess)
@@ -31391,7 +31391,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readSecurityPolicyAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelMaskAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPOctetStringAttributeCallback * onSuccess = new CHIPOctetStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31429,7 +31429,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelMaskAttribute)
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOperationalDatasetComponentsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback * onSuccess =
         new CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback(callback);
     if (!onSuccess)
@@ -31468,7 +31468,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOperationalDatasetComponen
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveNetworkFaultsListAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback * onSuccess =
         new CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(callback);
     if (!onSuccess)
@@ -31507,7 +31507,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveNetworkFaultsListAtt
 JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31543,7 +31543,7 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, WakeOnLanCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     WakeOnLanCluster * cppCluster = new WakeOnLanCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -31552,7 +31552,7 @@ JNI_METHOD(jlong, WakeOnLanCluster, initWithDevice)(JNIEnv * env, jobject self,
 
 JNI_METHOD(void, WakeOnLanCluster, readWakeOnLanMacAddressAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPCharStringAttributeCallback * onSuccess = new CHIPCharStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31589,7 +31589,7 @@ JNI_METHOD(void, WakeOnLanCluster, readWakeOnLanMacAddressAttribute)(JNIEnv * en
 
 JNI_METHOD(void, WakeOnLanCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31625,7 +31625,7 @@ JNI_METHOD(void, WakeOnLanCluster, readClusterRevisionAttribute)(JNIEnv * env, j
 }
 JNI_METHOD(jlong, WiFiNetworkDiagnosticsCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     WiFiNetworkDiagnosticsCluster * cppCluster = new WiFiNetworkDiagnosticsCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -31634,7 +31634,7 @@ JNI_METHOD(jlong, WiFiNetworkDiagnosticsCluster, initWithDevice)(JNIEnv * env, j
 
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster;
 
@@ -31680,7 +31680,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, jobje
 
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBssidAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPOctetStringAttributeCallback * onSuccess = new CHIPOctetStringAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31718,7 +31718,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBssidAttribute)(JNIEnv * env
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readSecurityTypeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31756,7 +31756,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readSecurityTypeAttribute)
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readWiFiVersionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31794,7 +31794,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readWiFiVersionAttribute)
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readChannelNumberAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31831,7 +31831,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readChannelNumberAttribute)
 
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readRssiAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8sAttributeCallback * onSuccess = new CHIPInt8sAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31869,7 +31869,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readRssiAttribute)(JNIEnv * env,
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconLostCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31907,7 +31907,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconLostCountAttribute)
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconRxCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31945,7 +31945,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconRxCountAttribute)
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastRxCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -31983,7 +31983,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastRxCountAttrib
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastTxCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32021,7 +32021,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastTxCountAttrib
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastRxCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32059,7 +32059,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastRxCountAttribut
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastTxCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt32uAttributeCallback * onSuccess = new CHIPInt32uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32097,7 +32097,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastTxCountAttribut
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readCurrentMaxRateAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32135,7 +32135,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readCurrentMaxRateAttribute)
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readOverrunCountAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt64uAttributeCallback * onSuccess = new CHIPInt64uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32173,7 +32173,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readOverrunCountAttribute)
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32209,7 +32209,7 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readClusterRevisionAttribute)
 }
 JNI_METHOD(jlong, WindowCoveringCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     WindowCoveringCluster * cppCluster = new WindowCoveringCluster();
 
     cppCluster->Associate(reinterpret_cast<Device *>(devicePtr), endpointId);
@@ -32218,7 +32218,7 @@ JNI_METHOD(jlong, WindowCoveringCluster, initWithDevice)(JNIEnv * env, jobject s
 
 JNI_METHOD(void, WindowCoveringCluster, downOrClose)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
 
@@ -32264,7 +32264,7 @@ JNI_METHOD(void, WindowCoveringCluster, downOrClose)(JNIEnv * env, jobject self,
 JNI_METHOD(void, WindowCoveringCluster, goToLiftPercentage)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint liftPercentageValue, jint liftPercent100thsValue)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
 
@@ -32310,7 +32310,7 @@ JNI_METHOD(void, WindowCoveringCluster, goToLiftPercentage)
 JNI_METHOD(void, WindowCoveringCluster, goToLiftValue)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint liftValue)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
 
@@ -32356,7 +32356,7 @@ JNI_METHOD(void, WindowCoveringCluster, goToLiftValue)
 JNI_METHOD(void, WindowCoveringCluster, goToTiltPercentage)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint tiltPercentageValue, jint tiltPercent100thsValue)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
 
@@ -32402,7 +32402,7 @@ JNI_METHOD(void, WindowCoveringCluster, goToTiltPercentage)
 JNI_METHOD(void, WindowCoveringCluster, goToTiltValue)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint tiltValue)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
 
@@ -32447,7 +32447,7 @@ JNI_METHOD(void, WindowCoveringCluster, goToTiltValue)
 }
 JNI_METHOD(void, WindowCoveringCluster, stopMotion)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
 
@@ -32492,7 +32492,7 @@ JNI_METHOD(void, WindowCoveringCluster, stopMotion)(JNIEnv * env, jobject self,
 }
 JNI_METHOD(void, WindowCoveringCluster, upOrOpen)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
 
@@ -32538,7 +32538,7 @@ JNI_METHOD(void, WindowCoveringCluster, upOrOpen)(JNIEnv * env, jobject self, jl
 
 JNI_METHOD(void, WindowCoveringCluster, readTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32576,7 +32576,7 @@ JNI_METHOD(void, WindowCoveringCluster, readTypeAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32614,7 +32614,7 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftAttribute)
 JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32651,7 +32651,7 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltAttribute)
 
 JNI_METHOD(void, WindowCoveringCluster, readConfigStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32689,7 +32689,7 @@ JNI_METHOD(void, WindowCoveringCluster, readConfigStatusAttribute)(JNIEnv * env,
 JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercentageAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32727,7 +32727,7 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercentageAttribu
 JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercentageAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32765,7 +32765,7 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercentageAttribu
 JNI_METHOD(void, WindowCoveringCluster, readOperationalStatusAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32803,7 +32803,7 @@ JNI_METHOD(void, WindowCoveringCluster, readOperationalStatusAttribute)
 JNI_METHOD(void, WindowCoveringCluster, readTargetPositionLiftPercent100thsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32841,7 +32841,7 @@ JNI_METHOD(void, WindowCoveringCluster, readTargetPositionLiftPercent100thsAttri
 JNI_METHOD(void, WindowCoveringCluster, readTargetPositionTiltPercent100thsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32878,7 +32878,7 @@ JNI_METHOD(void, WindowCoveringCluster, readTargetPositionTiltPercent100thsAttri
 
 JNI_METHOD(void, WindowCoveringCluster, readEndProductTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32916,7 +32916,7 @@ JNI_METHOD(void, WindowCoveringCluster, readEndProductTypeAttribute)(JNIEnv * en
 JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercent100thsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32954,7 +32954,7 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercent100thsAttr
 JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercent100thsAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -32992,7 +32992,7 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercent100thsAttr
 JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitLiftAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -33030,7 +33030,7 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitLiftAttribute)
 JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitLiftAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -33068,7 +33068,7 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitLiftAttribute)
 JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitTiltAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -33106,7 +33106,7 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitTiltAttribute)
 JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitTiltAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -33143,7 +33143,7 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitTiltAttribute)
 
 JNI_METHOD(void, WindowCoveringCluster, readModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt8uAttributeCallback * onSuccess = new CHIPInt8uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -33181,7 +33181,7 @@ JNI_METHOD(void, WindowCoveringCluster, readModeAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, WindowCoveringCluster, writeModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPDefaultSuccessCallback * onSuccess = new CHIPDefaultSuccessCallback(callback);
     if (!onSuccess)
     {
@@ -33218,7 +33218,7 @@ JNI_METHOD(void, WindowCoveringCluster, writeModeAttribute)
 
 JNI_METHOD(void, WindowCoveringCluster, readSafetyStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
@@ -33256,7 +33256,7 @@ JNI_METHOD(void, WindowCoveringCluster, readSafetyStatusAttribute)(JNIEnv * env,
 JNI_METHOD(void, WindowCoveringCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     CHIPInt16uAttributeCallback * onSuccess = new CHIPInt16uAttributeCallback(callback);
     if (!onSuccess)
     {
diff --git a/src/include/platform/PlatformManager.h b/src/include/platform/PlatformManager.h
index 860648105e0039..6b3950885fa2b7 100644
--- a/src/include/platform/PlatformManager.h
+++ b/src/include/platform/PlatformManager.h
@@ -254,6 +254,18 @@ class StackLock
     ~StackLock() { PlatformMgr().UnlockChipStack(); }
 };
 
+/**
+ * @brief
+ * RAII unlocking for PlatformManager to simplify management of
+ * LockChipStack()/UnlockChipStack calls.
+ */
+class StackUnlock
+{
+public:
+    StackUnlock() { PlatformMgr().UnlockChipStack(); }
+    ~StackUnlock() { PlatformMgr().LockChipStack(); }
+};
+
 } // namespace DeviceLayer
 } // namespace chip
 
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index e02e02481215d7..82e02fbdca8646 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -122,7 +122,6 @@ static_library("support") {
       "JniReferences.cpp",
       "JniReferences.h",
       "JniTypeWrappers.h",
-      "StackLock.h",
     ]
   }
 
diff --git a/src/lib/support/StackLock.h b/src/lib/support/StackLock.h
deleted file mode 100644
index ae59c076ecfefe..00000000000000
--- a/src/lib/support/StackLock.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <pthread.h>
-
-namespace chip {
-/** A scoped lock/unlock around a mutex. */
-struct StackLockGuard
-{
-public:
-    StackLockGuard(pthread_mutex_t * mutex) : mMutex(mutex) { pthread_mutex_lock(mMutex); }
-    ~StackLockGuard() { pthread_mutex_unlock(mMutex); }
-
-private:
-    pthread_mutex_t * mMutex;
-};
-
-/**
- * Use StackUnlockGuard to temporarily unlock the CHIP BLE stack, e.g. when calling application
- * or Android BLE code as a result of a BLE event.
- */
-struct StackUnlockGuard
-{
-public:
-    StackUnlockGuard(pthread_mutex_t * mutex) : mMutex(mutex) { pthread_mutex_unlock(mMutex); }
-    ~StackUnlockGuard() { pthread_mutex_lock(mMutex); }
-
-private:
-    pthread_mutex_t * mMutex;
-};
-} // namespace chip
diff --git a/src/platform/android/AndroidChipPlatform-JNI.cpp b/src/platform/android/AndroidChipPlatform-JNI.cpp
index 728fb2d11b9835..41c4da57d167f4 100644
--- a/src/platform/android/AndroidChipPlatform-JNI.cpp
+++ b/src/platform/android/AndroidChipPlatform-JNI.cpp
@@ -27,7 +27,6 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
-#include <lib/support/StackLock.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/ConfigurationManager.h>
 #include <platform/ConnectivityManager.h>
@@ -101,7 +100,7 @@ void AndroidChipPlatformJNI_OnUnload(JavaVM * jvm, void * reserved)
 JNI_METHOD(void, nativeSetBLEManager)(JNIEnv *, jobject, jobject manager)
 {
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     chip::DeviceLayer::Internal::BLEMgrImpl().InitializeWithObject(manager);
 #endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 }
@@ -109,6 +108,7 @@ JNI_METHOD(void, nativeSetBLEManager)(JNIEnv *, jobject, jobject manager)
 JNI_METHOD(void, handleWriteConfirmation)
 (JNIEnv * env, jobject self, jint conn, jbyteArray svcId, jbyteArray charId)
 {
+    chip::DeviceLayer::StackLock lock;
     BLE_CONNECTION_OBJECT const connObj = reinterpret_cast<BLE_CONNECTION_OBJECT>(conn);
 
     chip::Ble::ChipBleUUID svcUUID;
@@ -124,6 +124,7 @@ JNI_METHOD(void, handleWriteConfirmation)
 JNI_METHOD(void, handleIndicationReceived)
 (JNIEnv * env, jobject self, jint conn, jbyteArray svcId, jbyteArray charId, jbyteArray value)
 {
+    chip::DeviceLayer::StackLock lock;
     BLE_CONNECTION_OBJECT const connObj = reinterpret_cast<BLE_CONNECTION_OBJECT>(conn);
     const auto valueBegin               = env->GetByteArrayElements(value, nullptr);
     const auto valueLength              = env->GetArrayLength(value);
@@ -148,6 +149,7 @@ JNI_METHOD(void, handleIndicationReceived)
 JNI_METHOD(void, handleSubscribeComplete)
 (JNIEnv * env, jobject self, jint conn, jbyteArray svcId, jbyteArray charId)
 {
+    chip::DeviceLayer::StackLock lock;
     BLE_CONNECTION_OBJECT const connObj = reinterpret_cast<BLE_CONNECTION_OBJECT>(conn);
 
     chip::Ble::ChipBleUUID svcUUID;
@@ -163,6 +165,7 @@ JNI_METHOD(void, handleSubscribeComplete)
 JNI_METHOD(void, handleUnsubscribeComplete)
 (JNIEnv * env, jobject self, jint conn, jbyteArray svcId, jbyteArray charId)
 {
+    chip::DeviceLayer::StackLock lock;
     BLE_CONNECTION_OBJECT const connObj = reinterpret_cast<BLE_CONNECTION_OBJECT>(conn);
 
     chip::Ble::ChipBleUUID svcUUID;
@@ -177,6 +180,7 @@ JNI_METHOD(void, handleUnsubscribeComplete)
 
 JNI_METHOD(void, handleConnectionError)(JNIEnv * env, jobject self, jint conn)
 {
+    chip::DeviceLayer::StackLock lock;
     BLE_CONNECTION_OBJECT const connObj = reinterpret_cast<BLE_CONNECTION_OBJECT>(conn);
 
     chip::DeviceLayer::Internal::BLEMgrImpl().HandleConnectionError(connObj, BLE_ERROR_APP_CLOSED_CONNECTION);
@@ -185,21 +189,21 @@ JNI_METHOD(void, handleConnectionError)(JNIEnv * env, jobject self, jint conn)
 // for KeyValueStoreManager
 JNI_METHOD(void, setKeyValueStoreManager)(JNIEnv * env, jclass self, jobject manager)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     chip::DeviceLayer::PersistedStorage::KeyValueStoreMgrImpl().InitializeWithObject(manager);
 }
 
 // for ConfigurationManager
 JNI_METHOD(void, setConfigurationManager)(JNIEnv * env, jclass self, jobject manager)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     chip::DeviceLayer::ConfigurationMgrImpl().InitializeWithObject(manager);
 }
 
 // for ServiceResolver
 JNI_METHOD(void, nativeSetServiceResolver)(JNIEnv * env, jclass self, jobject resolver, jobject chipMdnsCallback)
 {
-    StackLockGuard lock(JniReferences::GetInstance().GetStackLock());
+    chip::DeviceLayer::StackLock lock;
     chip::Mdns::InitializeWithObjects(resolver, chipMdnsCallback);
 }
 
diff --git a/src/platform/android/AndroidConfig.cpp b/src/platform/android/AndroidConfig.cpp
index 7e38aa285f0e22..a70462506a7708 100644
--- a/src/platform/android/AndroidConfig.cpp
+++ b/src/platform/android/AndroidConfig.cpp
@@ -186,6 +186,7 @@ CHIP_ERROR AndroidConfig::ReadConfigValue(Key key, uint32_t & val)
 
 CHIP_ERROR AndroidConfig::ReadConfigValue(Key key, uint64_t & val)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     ReturnErrorCodeIf(gAndroidConfigObject == nullptr, CHIP_ERROR_INCORRECT_STATE);
     ReturnErrorCodeIf(gReadConfigValueLongMethod == nullptr, CHIP_ERROR_INCORRECT_STATE);
 
@@ -211,6 +212,7 @@ CHIP_ERROR AndroidConfig::ReadConfigValue(Key key, uint64_t & val)
 
 CHIP_ERROR AndroidConfig::ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     ReturnErrorCodeIf(gAndroidConfigObject == nullptr, CHIP_ERROR_INCORRECT_STATE);
     ReturnErrorCodeIf(gReadConfigValueStrMethod == nullptr, CHIP_ERROR_INCORRECT_STATE);
 
@@ -239,6 +241,7 @@ CHIP_ERROR AndroidConfig::ReadConfigValueStr(Key key, char * buf, size_t bufSize
 
 CHIP_ERROR AndroidConfig::ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     ReturnErrorCodeIf(gAndroidConfigObject == nullptr, CHIP_ERROR_INCORRECT_STATE);
     ReturnErrorCodeIf(gReadConfigValueBinMethod == nullptr, CHIP_ERROR_INCORRECT_STATE);
 
@@ -285,6 +288,7 @@ CHIP_ERROR AndroidConfig::WriteConfigValue(Key key, uint32_t val)
 
 CHIP_ERROR AndroidConfig::WriteConfigValue(Key key, uint64_t val)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     ReturnErrorCodeIf(gAndroidConfigObject == nullptr, CHIP_ERROR_INCORRECT_STATE);
     ReturnErrorCodeIf(gWriteConfigValueLongMethod == nullptr, CHIP_ERROR_INCORRECT_STATE);
 
@@ -309,6 +313,7 @@ CHIP_ERROR AndroidConfig::WriteConfigValue(Key key, uint64_t val)
 
 CHIP_ERROR AndroidConfig::WriteConfigValueStr(Key key, const char * str)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     ReturnErrorCodeIf(gAndroidConfigObject == nullptr, CHIP_ERROR_INCORRECT_STATE);
     ReturnErrorCodeIf(gWriteConfigValueStrMethod == nullptr, CHIP_ERROR_INCORRECT_STATE);
 
@@ -358,6 +363,7 @@ CHIP_ERROR AndroidConfig::WriteConfigValueStr(Key key, const char * str, size_t
 
 CHIP_ERROR AndroidConfig::WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     ReturnErrorCodeIf(gAndroidConfigObject == nullptr, CHIP_ERROR_INCORRECT_STATE);
     ReturnErrorCodeIf(gWriteConfigValueBinMethod == nullptr, CHIP_ERROR_INCORRECT_STATE);
 
@@ -382,6 +388,7 @@ CHIP_ERROR AndroidConfig::WriteConfigValueBin(Key key, const uint8_t * data, siz
 
 CHIP_ERROR AndroidConfig::ClearConfigValue(Key key)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     ReturnErrorCodeIf(gAndroidConfigObject == nullptr, CHIP_ERROR_INCORRECT_STATE);
     ReturnErrorCodeIf(gClearConfigValueMethod == nullptr, CHIP_ERROR_INCORRECT_STATE);
 
@@ -405,6 +412,7 @@ CHIP_ERROR AndroidConfig::ClearConfigValue(Key key)
 
 bool AndroidConfig::ConfigValueExists(Key key)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     ReturnErrorCodeIf(gAndroidConfigObject == nullptr, false);
     ReturnErrorCodeIf(gConfigValueExistsMethod == nullptr, false);
 
diff --git a/src/platform/android/BLEManagerImpl.cpp b/src/platform/android/BLEManagerImpl.cpp
index 246fd55097bcd6..4f1b0032187293 100644
--- a/src/platform/android/BLEManagerImpl.cpp
+++ b/src/platform/android/BLEManagerImpl.cpp
@@ -28,7 +28,6 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/SafeInt.h>
-#include <lib/support/StackLock.h>
 #include <platform/internal/BLEManager.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
@@ -239,6 +238,7 @@ BleLayer * BLEManagerImpl::_GetBleLayer()
 
 bool BLEManagerImpl::SubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const ChipBleUUID * svcId, const ChipBleUUID * charId)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
     jbyteArray svcIdObj;
@@ -277,6 +277,7 @@ bool BLEManagerImpl::SubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const
 
 bool BLEManagerImpl::UnsubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const ChipBleUUID * svcId, const ChipBleUUID * charId)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
     jbyteArray svcIdObj;
@@ -315,6 +316,7 @@ bool BLEManagerImpl::UnsubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, cons
 
 bool BLEManagerImpl::CloseConnection(BLE_CONNECTION_OBJECT conId)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
     intptr_t tmpConnObj;
@@ -343,6 +345,7 @@ bool BLEManagerImpl::CloseConnection(BLE_CONNECTION_OBJECT conId)
 
 uint16_t BLEManagerImpl::GetMTU(BLE_CONNECTION_OBJECT conId) const
 {
+    chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
     intptr_t tmpConnObj;
@@ -379,6 +382,7 @@ bool BLEManagerImpl::SendIndication(BLE_CONNECTION_OBJECT conId, const ChipBleUU
 bool BLEManagerImpl::SendWriteRequest(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId, const Ble::ChipBleUUID * charId,
                                       chip::System::PacketBufferHandle pBuf)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
     jbyteArray svcIdObj;
@@ -438,6 +442,7 @@ bool BLEManagerImpl::SendReadResponse(BLE_CONNECTION_OBJECT conId, BLE_READ_REQU
 
 void BLEManagerImpl::NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT conId)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
     intptr_t tmpConnObj;
@@ -464,6 +469,7 @@ void BLEManagerImpl::NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT conId)
 
 void BLEManagerImpl::NewConnection(BleLayer * bleLayer, void * appState, const uint16_t connDiscriminator)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
 
@@ -495,6 +501,7 @@ CHIP_ERROR BLEManagerImpl::CancelConnection()
 
 CHIP_ERROR BLEManagerImpl::HasFlag(BLEManagerImpl::Flags flag, bool & has)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     long f = static_cast<long>(flag);
 
     VerifyOrReturnLogError(mBLEManagerObject != nullptr, CHIP_ERROR_INCORRECT_STATE);
@@ -517,6 +524,7 @@ CHIP_ERROR BLEManagerImpl::HasFlag(BLEManagerImpl::Flags flag, bool & has)
 
 CHIP_ERROR BLEManagerImpl::SetFlag(BLEManagerImpl::Flags flag, bool isSet)
 {
+    chip::DeviceLayer::StackUnlock unlock;
     long jFlag      = static_cast<long>(flag);
     jboolean jIsSet = static_cast<jboolean>(isSet);