diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index e285b0cbcc16..ac2b08acbac9 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -13,8 +13,8 @@ RUN cd /tmp/ && mv cmdline-tools/ latest/ && mv latest/ /usr/lib/android-sdk/cmd
 RUN mkdir /usr/lib/android-sdk/licenses/
 RUN chmod -R 755 /usr/lib/android-sdk/
 RUN mkdir -p "$HOME/.gradle" && \
-    echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > "$HOME/.gradle/gradle.properties" && \
+    echo "org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8" > "$HOME/.gradle/gradle.properties" && \
     echo "org.gradle.caching=true" >> "$HOME/.gradle/gradle.properties" && \
     echo "org.gradle.parallel=true" >> "$HOME/.gradle/gradle.properties" && \
     echo "org.gradle.configureondemand=true" >> "$HOME/.gradle/gradle.properties" && \
-    echo "kapt.incremental.apt=true" >> "$HOME/.gradle/gradle.properties"
\ No newline at end of file
+    echo "kapt.incremental.apt=true" >> "$HOME/.gradle/gradle.properties"
diff --git a/.drone.yml b/.drone.yml
index 1541f7f115db..c0555f3c9d31 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,12 +24,12 @@ steps:
       - scripts/checkIfRunDrone.sh $DRONE_PULL_REQUEST || exit 0
       - emulator -avd android -no-snapshot -gpu swiftshader_indirect -no-window -no-audio -skin 500x833 &
       - sed -i s'#<bool name="is_beta">false</bool>#<bool name="is_beta">true</bool>#'g app/src/main/res/values/setup.xml
-      - ./gradlew assembleGplayDebugAndroidTest
+      - ./gradlew -no-daemon assembleGplayDebugAndroidTest
       - scripts/wait_for_emulator.sh
-      - ./gradlew installGplayDebugAndroidTest
+      - ./gradlew -no-daemon installGplayDebugAndroidTest
       - scripts/wait_for_server.sh "server"
       - scripts/deleteOldComments.sh "stable" "IT" $DRONE_PULL_REQUEST
-      - ./gradlew createGplayDebugCoverageReport -Pcoverage -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "IT" $DRONE_PULL_REQUEST
+      - ./gradlew -no-daemon createGplayDebugCoverageReport -Pcoverage -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "IT" $DRONE_PULL_REQUEST
 
 services:
   - name: server
@@ -185,6 +185,6 @@ name: GIT_TOKEN
 data: XIoa9IYq+xQ+N5iln8dlpWv0jV6ROr7HuE24ioUr4uQ8m8SjyH0yognWYLYLqnbTKrFWlFZiEMQTH/sZiWjRFvV1iL0=
 ---
 kind: signature
-hmac: b4568fe767026f67cca8c416c20cc522fd1d06941c836ca7eb4955682855d237
+hmac: 8d701d9c3be287f10b9cb9904e6eab01f7f92da5c9dc5d3dedf807a2af86efcb
 
 ...
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index b5173d17a41f..e30d11bba911 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -71,7 +71,7 @@ jobs:
                 run: |
                     mkdir -p "$HOME/.gradle"
                     {
-                        echo "org.gradle.jvmargs=-Xmx5g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g"
+                        echo "org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
                         echo "org.gradle.configureondemand=true"
                         echo "org.gradle.configuration-cache=false"
                         echo "kapt.incremental.apt=true"
diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml
index 5f30559fa8c3..c8f9d4dac344 100644
--- a/.github/workflows/assembleFlavors.yml
+++ b/.github/workflows/assembleFlavors.yml
@@ -31,9 +31,9 @@ jobs:
             -   uses: gradle/actions/wrapper-validation@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
             -   name: Build ${{ matrix.flavor }}
                 run: |
-                    echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" >> gradle.properties
+                    echo "org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8" >> gradle.properties
                     echo "org.gradle.caching=true" >> gradle.properties
                     echo "org.gradle.parallel=true" >> gradle.properties
                     echo "org.gradle.configureondemand=true" >> gradle.properties
                     echo "kapt.incremental.apt=true" >> gradle.properties
-                    ./gradlew assemble${{ matrix.flavor }}
+                    ./gradlew --no-daemon --no-configuration-cache assemble${{ matrix.flavor }}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index ddf18dd2c422..8f75234195df 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -29,4 +29,4 @@ jobs:
                     distribution: "temurin"
                     java-version: 17
             -   name: Check ${{ matrix.task }}
-                run: ./gradlew ${{ matrix.task }}
+                run: ./gradlew --no-daemon --no-configuration-cache ${{ matrix.task }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 1af0818ddc43..f26b8c8fb3f1 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Assemble
         run: |
           mkdir -p "$HOME/.gradle"
-          echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
-          ./gradlew assembleDebug
+          echo "org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8" > "$HOME/.gradle/gradle.properties"
+          ./gradlew --no-daemon --no-configuration-cache assembleDebug
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
index 5a0f7839d234..7c8a0b0d91e7 100644
--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@@ -46,10 +46,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           mkdir -p "$HOME/.gradle"
-          echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > "$HOME/.gradle/gradle.properties"
+          echo "org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8" > "$HOME/.gradle/gradle.properties"
           echo "org.gradle.caching=true; org.gradle.parallel=true; org.gradle.configureondemand=true; kapt.incremental.apt=true" >> "$HOME/.gradle/gradle.properties"
           sed -i "/qa/,/\}/ s/versionCode.*/versionCode = ${{ github.event.number }}/" app/build.gradle.kts
           sed -i "/qa/,/\}/ s/versionName.*/versionName = \"${{ github.event.number }}\"/" app/build.gradle.kts
-          ./gradlew assembleQaDebug
+          ./gradlew --no-daemon --no-configuration-cache assembleQaDebug
           $(find /usr/local/lib/android/sdk/build-tools/*/apksigner | sort | tail -n1) sign  --ks-pass pass:"$KS_PASS" --key-pass pass:"$KEY_PASS" --ks-key-alias key0 --ks ".github/workflows/QA_keystore.jks" app/build/outputs/apk/qa/debug/*qa-debug*.apk
           .github/workflows/uploadArtifact.sh "$LOG_USERNAME" "$LOG_PASSWORD" "${{github.event.number}}" "${{github.event.number}}" "$GITHUB_TOKEN"
diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml
index 2df2c792c9b3..5fe1420449ad 100644
--- a/.github/workflows/screenShotTest.yml
+++ b/.github/workflows/screenShotTest.yml
@@ -69,14 +69,14 @@ jobs:
             -   name: Configure gradle daemon
                 run: |
                     mkdir -p $HOME/.gradle
-                    echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > $HOME/.gradle/gradle.properties
+                    echo "org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8" > $HOME/.gradle/gradle.properties
                     echo "org.gradle.caching=true" >> $HOME/.gradle/gradle.properties
                     echo "org.gradle.parallel=true" >> $HOME/.gradle/gradle.properties
                     echo "org.gradle.configureondemand=true" >> $HOME/.gradle/gradle.properties
                     echo "kapt.incremental.apt=true" >> $HOME/.gradle/gradle.properties
 
             -   name: Build gplay
-                run: ./gradlew assembleGenericDebug
+                run: ./gradlew --no-daemon --no-configuration-cache assembleGenericDebug
 
             -   name: Delete old comments
                 env:
@@ -95,7 +95,7 @@ jobs:
                     sdcard-path-or-size: 100M
                     target: google_apis
                     emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -skin 500x833
-                    script: ./gradlew uninstallAll genericDebugExecuteScreenshotTests -Dorg.gradle.jvmargs="--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.nio.channels=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED" -Pandroid.testInstrumentationRunnerArguments.annotation=com.owncloud.android.utils.ScreenshotTest -Pandroid.testInstrumentationRunnerArguments.COLOR=${{ matrix.color }} -Pandroid.testInstrumentationRunnerArguments.DARKMODE=${{ matrix.scheme }}
+                    script: ./gradlew --no-daemon --no-configuration-cache uninstallAll genericDebugExecuteScreenshotTests -Dorg.gradle.jvmargs="--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.nio.channels=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED" -Pandroid.testInstrumentationRunnerArguments.annotation=com.owncloud.android.utils.ScreenshotTest -Pandroid.testInstrumentationRunnerArguments.COLOR=${{ matrix.color }} -Pandroid.testInstrumentationRunnerArguments.DARKMODE=${{ matrix.scheme }}
             -   name: upload failing results
                 if: ${{ failure() }}
                 env:
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 3687550385ff..5937baa63229 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -40,7 +40,7 @@ jobs:
               uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
 
             - name: Run unit tests with coverage
-              run: ./gradlew jacocoTestGplayDebugUnitTest
+              run: ./gradlew --no-daemon --no-configuration-cache jacocoTestGplayDebugUnitTest
 
             - name: Upload failing results
               if: ${{ failure() }}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 68961b2ef104..8fc40597dcc1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,7 +54,6 @@
     <string name="offline_operations_worker_progress_text" translatable="false">%1$d / %2$d - %3$s</string>
     <string name="anonymous_account_type" translatable="false">AnonymousAccountType</string>
 
-    <string name="assistant_screen_task_types_error_state_message">Unable to fetch task types, please check your internet connection.</string>
     <string name="assistant_screen_task_list_error_state_message">Unable to fetch task list, please check your internet connection.</string>
     <string name="assistant_screen_task_list_empty_warning">Task list is empty. Check assistant app configuration.</string>
 
@@ -727,7 +726,6 @@
     <string name="manage_space_description">Settings, database and server certificates from %1$s\'s data will be deleted permanently. \n\nDownloaded files will be kept untouched.\n\nThis process can take a while.</string>
     <string name="manage_space_clear_data">Clear data</string>
 
-    <string name="permission_storage_access">Additional permissions required to upload and download files.</string>
     <string name="local_file_not_found_message">File not found in local file system</string>
     <string name="confirmation_remove_files_alert">Do you really want to delete the selected items?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to delete the selected items and their contents?</string>
@@ -1157,7 +1155,6 @@
     <string name="failed_to_start_editor">Failed to start editor</string>
     <string name="create_rich_workspace">Add folder description</string>
     <string name="creates_rich_workspace">Adds folder description</string>
-    <string name="uploader_local_files_uploaded">Retry to upload failed local files</string>
     <string name="uploader_file_not_found_on_server_message">We couldnt locate the file on server. Another user may have deleted the file</string>
     <string name="uploader_file_not_found_message">File not found. Are you sure that this file exists or has a previous conflict not been resolved?</string>
     <string name="uploader_upload_failed_sync_conflict_error">File upload conflict</string>
diff --git a/gradle.properties b/gradle.properties
index 50cc48359122..b15ce8b768cf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ android.nonTransitiveRClass=true
 
 
 # JVM arguments to optimize heap usage, enable heap dump on out-of-memory errors, and set the file encoding
-org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
+org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.dependency.verification.console=verbose
 kotlin.daemon.jvmargs=-Xmx6144m -XX:+UseParallelGC
 org.gradle.caching=true