diff --git a/.cursor/rules/bun.mdc b/.cursor/rules/bun.mdc
deleted file mode 100644
index a9f18aba..00000000
--- a/.cursor/rules/bun.mdc
+++ /dev/null
@@ -1,14 +0,0 @@
----
-description: Use Bun instead of Node.js, npm, pnpm
-globs: '*.ts, *.tsx, *.html, *.css, *.js, *.jsx, package.json'
-alwaysApply: false
----
-
-Default to using Bun instead of Node.js.
-
-- Use `bun <file>` instead of `node <file>` or `ts-node <file>`
-- Use `bun build <file.html|file.ts|file.css>` instead of `webpack` or `esbuild`
-- Use `bun install` instead of `npm install` or `yarn install` or `pnpm install`
-- Use `bun run <script>` instead of `npm run <script>` or `yarn run <script>` or `pnpm run <script>`
-- Use `bunx <package> <command>` instead of `npx <package> <command>`
-- Bun automatically loads .env, so don't use dotenv.
diff --git a/.cursor/rules/pr-conventions.mdc b/.cursor/rules/pr-conventions.mdc
deleted file mode 100644
index cd953b17..00000000
--- a/.cursor/rules/pr-conventions.mdc
+++ /dev/null
@@ -1,32 +0,0 @@
----
-description: Conventions for pull request titles and body content
-alwaysApply: true
----
-
-# Pull Request Conventions
-
-## PR Title
-
-Use semantic/conventional commit prefixes in PR titles:
-
-- `fix:` for bug fixes
-- `feat:` for new features
-- `chore:` for maintenance tasks (deps, CI, tooling)
-- `refactor:` for code restructuring without behavior changes
-- `docs:` for documentation-only changes
-- `test:` for test-only changes
-
-Example: `fix: resolve notification grouping on Android 14`
-
-## PR Body
-
-Follow the repo's PR template at `.github/pull_request_template.md`. Every PR body must include:
-
-1. **One Line Summary** (required)
-2. **Motivation** (required) explaining why the change is being made
-3. **Scope** (recommended) describing what is and isn't affected
-4. **Testing** section with manual and/or unit testing details
-5. **Affected code checklist** with relevant items checked
-6. **Checklist** sections confirmed
-
-Remove the instructional header block (between `<!-- START -->` and `<!-- END -->`) before submitting.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 9594f954..984de1e8 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -18,5 +18,7 @@ jobs:
       github.event.pull_request.merged == true &&
       contains(github.event.pull_request.title, 'chore: Release')
     uses: OneSignal/sdk-shared/.github/workflows/publish-npm-github.yml@main
+    secrets:
+      GH_PUSH_TOKEN: ${{ secrets.GH_PUSH_TOKEN }}
     with:
       branch: ${{ github.event.pull_request.base.ref }}
diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
index cddd491a..4dd19dbb 100644
--- a/.github/workflows/create-release-pr.yml
+++ b/.github/workflows/create-release-pr.yml
@@ -94,7 +94,7 @@ jobs:
 
           # Get versions from target branch (not the release branch)
           CURRENT_VERSION=$(git show origin/${{ inputs.target_branch }}:package.json | jq -r .version)
-          ANDROID_VERSION=$(git show origin/${{ inputs.target_branch }}:android/build.gradle | grep "api 'com.onesignal:OneSignal:" | sed -E "s/.*OneSignal:([0-9.]+).*/\1/")
+          ANDROID_VERSION=$(git show origin/${{ inputs.target_branch }}:android/build.gradle | grep "com.onesignal:OneSignal:" | sed -E "s/.*OneSignal:([0-9.]+).*/\1/")
           IOS_VERSION=$(git show origin/${{ inputs.target_branch }}:react-native-onesignal.podspec | grep "OneSignalXCFramework" | sed -E "s/.*'([0-9.]+)'.*/\1/")
 
           echo "rn_from=$CURRENT_VERSION" >> $GITHUB_OUTPUT
@@ -116,8 +116,8 @@ jobs:
             exit 1
           fi
 
-          # Update Android SDK version in build.gradle
-          sed -i '' "s/api 'com.onesignal:OneSignal:[^']*'/api 'com.onesignal:OneSignal:$VERSION'/" android/build.gradle
+          # Update Android SDK version in build.gradle (handles both api '...' and api('...') syntax)
+          sed -i '' -E "s/(com\.onesignal:OneSignal:)[0-9.]+/\1$VERSION/" android/build.gradle
           echo "✓ Updated android/build.gradle with Android SDK ${VERSION}"
 
           # Only commit if there are changes
diff --git a/.github/workflows/linear-deployed.yml b/.github/workflows/linear-deployed.yml
new file mode 100644
index 00000000..b5af2c97
--- /dev/null
+++ b/.github/workflows/linear-deployed.yml
@@ -0,0 +1,13 @@
+name: Move Linear tickets to Deployed
+
+on:
+  release:
+    types: [published, edited]
+
+jobs:
+  linear-deployed:
+    uses: OneSignal/sdk-shared/.github/workflows/linear-deployed.yml@main
+    with:
+      release_body: ${{ github.event.release.body }}
+    secrets:
+      LINEAR_GITHUB_API_KEY: ${{ secrets.LINEAR_GITHUB_API_KEY }}
diff --git a/android/build.gradle b/android/build.gradle
index 349d8960..fb12657c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -32,7 +32,13 @@ dependencies {
 
     // api is used instead of implementation so the parent :app project can access any of the OneSignal Java
     //   classes if needed. Such as com.onesignal.NotificationExtenderService
-    api 'com.onesignal:OneSignal:5.7.2'
-    
+    //
+    // Exclude OkHttp from OneSignal's transitive deps: the 5.7.x otel module pulls in OkHttp 5.x
+    // (via opentelemetry-exporter-sender-okhttp) which is binary-incompatible with React Native's
+    // networking stack (okhttp3.internal.Util removed in 5.x). React Native already provides OkHttp 4.x.
+    api('com.onesignal:OneSignal:5.7.2') {
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    }
+
     testImplementation 'junit:junit:4.12'
-}
\ No newline at end of file
+}
diff --git a/examples/demo/android/app/build.gradle b/examples/demo/android/app/build.gradle
index 5d655637..4194e4a7 100644
--- a/examples/demo/android/app/build.gradle
+++ b/examples/demo/android/app/build.gradle
@@ -109,12 +109,6 @@ android {
 
 apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
 
-configurations.all {
-    resolutionStrategy {
-        force 'com.squareup.okhttp3:okhttp:4.12.0'
-    }
-}
-
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
diff --git a/examples/demo/bun.lock b/examples/demo/bun.lock
index 9f6135e3..65d6c9d9 100644
--- a/examples/demo/bun.lock
+++ b/examples/demo/bun.lock
@@ -1368,7 +1368,7 @@
 
     "react-native": ["react-native@0.84.0", "", { "dependencies": { "@jest/create-cache-key-function": "^29.7.0", "@react-native/assets-registry": "0.84.0", "@react-native/codegen": "0.84.0", "@react-native/community-cli-plugin": "0.84.0", "@react-native/gradle-plugin": "0.84.0", "@react-native/js-polyfills": "0.84.0", "@react-native/normalize-colors": "0.84.0", "@react-native/virtualized-lists": "0.84.0", "abort-controller": "^3.0.0", "anser": "^1.4.9", "ansi-regex": "^5.0.0", "babel-jest": "^29.7.0", "babel-plugin-syntax-hermes-parser": "0.32.0", "base64-js": "^1.5.1", "commander": "^12.0.0", "flow-enums-runtime": "^0.0.6", "hermes-compiler": "250829098.0.7", "invariant": "^2.2.4", "jest-environment-node": "^29.7.0", "memoize-one": "^5.0.0", "metro-runtime": "^0.83.3", "metro-source-map": "^0.83.3", "nullthrows": "^1.1.1", "pretty-format": "^29.7.0", "promise": "^8.3.0", "react-devtools-core": "^6.1.5", "react-refresh": "^0.14.0", "regenerator-runtime": "^0.13.2", "scheduler": "0.27.0", "semver": "^7.1.3", "stacktrace-parser": "^0.1.10", "tinyglobby": "^0.2.15", "whatwg-fetch": "^3.0.0", "ws": "^7.5.10", "yargs": "^17.6.2" }, "peerDependencies": { "@types/react": "^19.1.1", "react": "^19.2.3" }, "optionalPeers": ["@types/react"], "bin": { "react-native": "cli.js" } }, "sha512-CcBfucLDHz8MAjQx9kFXasYtpcn8zP1YapUgGtAy0psRZTLShwF9yeh5+ErSgEK2gXV1CCSz7hqCZqx1eMyBLA=="],
 
-    "react-native-onesignal": ["react-native-onesignal@../../react-native-onesignal.tgz", { "dependencies": { "invariant": "^2.2.4" } }, "sha512-0nTugjtXXMwK59Ff5KAYsiYb5wvMAM7YQiDEEga2JNZ4fHlst3VY4YAEsepA7RuddO2sZxzthOZ+NkGaiTVC/w=="],
+    "react-native-onesignal": ["react-native-onesignal@../../react-native-onesignal.tgz", { "dependencies": { "invariant": "^2.2.4" } }, "sha512-uxXaJYopKixrHXVvFjWH+ek5wbGydTxbrZ6e36BzCAKM2fHSyIiefcUY0niT+MWg8fDlHEwpocmY4KvM9AmvYA=="],
 
     "react-native-safe-area-context": ["react-native-safe-area-context@5.6.2", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-4XGqMNj5qjUTYywJqpdWZ9IG8jgkS3h06sfVjfw5yZQZfWnRFXczi0GnYyFyCc2EBps/qFmoCH8fez//WumdVg=="],