diff --git a/Maps3DSamples/ApiDemos/java-app/build.gradle.kts b/Maps3DSamples/ApiDemos/java-app/build.gradle.kts
index ee66293..0fdc9f9 100644
--- a/Maps3DSamples/ApiDemos/java-app/build.gradle.kts
+++ b/Maps3DSamples/ApiDemos/java-app/build.gradle.kts
@@ -19,7 +19,9 @@ import java.io.File
 
 // Check for secrets.properties file before proceeding with build tasks.
 val secretsFile = rootProject.file("secrets.properties")
-if (!secretsFile.exists() && System.getenv("CI") != "true") {
+val isCI = System.getenv("CI")?.toBoolean() ?: false
+
+if (!secretsFile.exists() && !isCI) {
     val requestedTasks = gradle.startParameter.taskNames
     if (requestedTasks.isEmpty()) {
         // It's likely an IDE sync if no tasks are specified, so just issue a warning.
@@ -39,7 +41,11 @@ if (!secretsFile.exists() && System.getenv("CI") != "true") {
             }
         }
 
-        if (isBuildTask && !isTestTask) {
+        val isDebugTask = requestedTasks.any { task ->
+            task.contains("Debug", ignoreCase = true)
+        }
+
+        if (isBuildTask && !isTestTask && isDebugTask) {
             val defaultsFile = rootProject.file("local.defaults.properties")
             val requiredKeysMessage = if (defaultsFile.exists()) {
                 defaultsFile.readText()
@@ -108,17 +114,19 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
+    implementation(libs.play.services.base)
+    implementation(project(":common"))
+
     testImplementation(libs.junit)
+
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(project(":common"))
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
+    androidTestImplementation(libs.truth)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-
-    implementation(libs.play.services.base)
-    implementation(project(":common"))
 }
 
 secrets {
diff --git a/Maps3DSamples/ApiDemos/kotlin-app/build.gradle.kts b/Maps3DSamples/ApiDemos/kotlin-app/build.gradle.kts
index 1abe386..67c1f49 100644
--- a/Maps3DSamples/ApiDemos/kotlin-app/build.gradle.kts
+++ b/Maps3DSamples/ApiDemos/kotlin-app/build.gradle.kts
@@ -19,7 +19,9 @@ import java.io.File
 
 // Check for secrets.properties file before proceeding with build tasks.
 val secretsFile = rootProject.file("secrets.properties")
-if (!secretsFile.exists() && System.getenv("CI") != "true") {
+val isCI = System.getenv("CI")?.toBoolean() ?: false
+
+if (!secretsFile.exists() && !isCI) {
     val requestedTasks = gradle.startParameter.taskNames
     if (requestedTasks.isEmpty()) {
         // It's likely an IDE sync if no tasks are specified, so just issue a warning.
@@ -39,7 +41,11 @@ if (!secretsFile.exists() && System.getenv("CI") != "true") {
             }
         }
 
-        if (isBuildTask && !isTestTask) {
+        val isDebugTask = requestedTasks.any { task ->
+            task.contains("Debug", ignoreCase = true)
+        }
+
+        if (isBuildTask && !isTestTask && isDebugTask) {
             val defaultsFile = rootProject.file("local.defaults.properties")
             val requiredKeysMessage = if (defaultsFile.exists()) {
                 defaultsFile.readText()
@@ -140,11 +146,9 @@ secrets {
     defaultPropertiesFileName = "local.defaults.properties"
 }
 
-tasks.register<Exec>("launchDebug") {
+tasks.register<Exec>("installAndLaunch") {
+    description = "Installs and launches the demo app."
+    group = "install"
     dependsOn("installDebug")
-    commandLine("adb", "shell", "am", "start", "-n", "com.example.maps3dkotlin/.MainActivity")
-    doLast {
-        println("Launched com.example.maps3dkotlin/.MainActivity")
-    }
+    commandLine("adb", "shell", "am", "start", "-n", "com.example.maps3dkotlin/.mainactivity.MainActivity")
 }
-
diff --git a/Maps3DSamples/advanced/app/build.gradle.kts b/Maps3DSamples/advanced/app/build.gradle.kts
index 54b12c7..6986743 100644
--- a/Maps3DSamples/advanced/app/build.gradle.kts
+++ b/Maps3DSamples/advanced/app/build.gradle.kts
@@ -19,7 +19,9 @@ import java.io.File
 
 // Check for secrets.properties file before proceeding with build tasks.
 val secretsFile = rootProject.file("secrets.properties")
-if (!secretsFile.exists()) {
+val isCI = System.getenv("CI")?.toBoolean() ?: false
+
+if (!secretsFile.exists() && !isCI) {
     val requestedTasks = gradle.startParameter.taskNames
     if (requestedTasks.isEmpty()) {
         // It's likely an IDE sync if no tasks are specified, so just issue a warning.
@@ -39,7 +41,11 @@ if (!secretsFile.exists()) {
             }
         }
 
-        if (isBuildTask && !isTestTask) {
+        val isDebugTask = requestedTasks.any { task ->
+            task.contains("Debug", ignoreCase = true)
+        }
+
+        if (isBuildTask && !isTestTask && isDebugTask) {
             val defaultsFile = rootProject.file("local.defaults.properties")
             val requiredKeysMessage = if (defaultsFile.exists()) {
                 defaultsFile.readText()