diff --git a/add_to_app/android_view/android_view/app/build.gradle b/add_to_app/android_view/android_view/app/build.gradle
index 69dc9bdb9c3..7977fae8905 100644
--- a/add_to_app/android_view/android_view/app/build.gradle
+++ b/add_to_app/android_view/android_view/app/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
 
     lint {
         baseline = file("lint-baseline.xml")
@@ -13,7 +13,7 @@ android {
     defaultConfig {
         applicationId "dev.flutter.example.androidView"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
diff --git a/add_to_app/android_view/android_view/app/src/main/java/dev/flutter/example/androidView/MainActivity.kt b/add_to_app/android_view/android_view/app/src/main/java/dev/flutter/example/androidView/MainActivity.kt
index 638079a2c8f..5367a605659 100644
--- a/add_to_app/android_view/android_view/app/src/main/java/dev/flutter/example/androidView/MainActivity.kt
+++ b/add_to_app/android_view/android_view/app/src/main/java/dev/flutter/example/androidView/MainActivity.kt
@@ -62,8 +62,14 @@ class MainActivity : AppCompatActivity() {
         // If the activity was restarted, keep track of the previous scroll
         // position and of the previous cell indices that were randomly selected
         // as Flutter cells to preserve immersion.
-        val state = BundleCompat.getParcelable<Parcelable>(savedInstanceState!!, "layoutManager", Parcelable::class.java);
-        layoutManager.onRestoreInstanceState(state)
+        if (savedInstanceState != null) {
+            val state = BundleCompat.getParcelable<Parcelable>(
+                savedInstanceState,
+                "layoutManager",
+                Parcelable::class.java
+            )
+            layoutManager.onRestoreInstanceState(state)
+        }
         val previousFlutterCellsArray = savedInstanceState?.getIntegerArrayList("adapter")
         if (previousFlutterCellsArray != null) {
             adapter.previousFlutterCells = TreeSet(previousFlutterCellsArray)
diff --git a/add_to_app/android_view/android_view/build.gradle b/add_to_app/android_view/android_view/build.gradle
index 92b01718cbd..f6f55b6614e 100644
--- a/add_to_app/android_view/android_view/build.gradle
+++ b/add_to_app/android_view/android_view/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/add_to_app/android_view/android_view/gradle.properties b/add_to_app/android_view/android_view/gradle.properties
index 252175276f7..c8ce6fbcce6 100644
--- a/add_to_app/android_view/android_view/gradle.properties
+++ b/add_to_app/android_view/android_view/gradle.properties
@@ -16,4 +16,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties b/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties
index 8049c684f04..17655d0ef2b 100644
--- a/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists