Merge "Update THREAD_ENABLED key string in ThreadPersistentSettings" into main