diff --git a/app/src/androidTest/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapterIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapterIT.kt
index 4dbb2a4207dc..f3fff0c9742a 100644
--- a/app/src/androidTest/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapterIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapterIT.kt
@@ -15,7 +15,6 @@ import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.client.preferences.AppPreferencesImpl
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.datamodel.OCFile
-import com.owncloud.android.datamodel.SyncedFolderProvider
 import com.owncloud.android.lib.common.SearchResultEntry
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.interfaces.UnifiedSearchCurrentDirItemAction
@@ -133,16 +132,9 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
         currentDirItems: List<OCFile> = emptyList(),
         supportsCalendarContacts: Boolean = false
     ): UnifiedSearchListAdapter {
-        val syncedFolderProvider = SyncedFolderProvider(
-            targetContext.contentResolver,
-            preferences,
-            sut.clock
-        )
-
         val accountManager = UserAccountManagerImpl.fromContext(targetContext)
 
         overlayManager = OverlayManager(
-            syncedFolderProvider = syncedFolderProvider,
             preferences = preferences,
             viewThemeUtils = sut.viewThemeUtils,
             context = targetContext,
diff --git a/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt b/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt
index d3d4a0660875..b75f9374dc47 100644
--- a/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt
+++ b/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt
@@ -70,10 +70,11 @@ class GallerySearchTask(
         ocCapability: com.owncloud.android.lib.resources.status.OCCapability
     ): SearchRemoteOperation =
         SearchRemoteOperation("", SearchRemoteOperation.SearchType.GALLERY_SEARCH, false, ocCapability).apply {
-            setLimit(limit)
-            setEndDate(endDate)
+            limit = this@GallerySearchTask.limit
+            endDate = this@GallerySearchTask.endDate
+
             // workaround to keep SearchRemoteOperation functioning correctly even if we don't actively use startDate
-            setStartDate(0L)
+            startDate = 0L
         }
 
     private fun logSearchStart() {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8eaf64ee2c9f..256517c790b3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "0.33.2"
 androidGifDrawableVersion = "1.2.31"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion ="1c847678482c739d0b92e27a445d2f5f168f7d33"
+androidLibraryVersion ="dd85553abaea1c05dc514268a3cf4a976535bc2b"
 androidOpensslVersion = "3.5.6"
 androidPluginVersion = "9.2.1"
 androidsvgVersion = "1.4"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index eca475f05b55..07e384abe004 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -21877,6 +21877,14 @@
             <sha256 value="4c8a390a4caf47a385c29aa6463399fbb149272d7bc5f3f50e371595f8c73605" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="dd85553abaea1c05dc514268a3cf4a976535bc2b">
+         <artifact name="android-library-dd85553abaea1c05dc514268a3cf4a976535bc2b.aar">
+            <sha256 value="a7cdfc02c68f723b83cd262e6e6447bfe8453aac3084c57fb898208e069459ea" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-dd85553abaea1c05dc514268a3cf4a976535bc2b.module">
+            <sha256 value="26dc1367c9a62c1dd459b9577ec1bbeec653978b2054dd0bb2b754377f6afc71" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="e0fb84cbb0">
          <artifact name="android-library-e0fb84cbb0.aar">
             <sha256 value="195b58450aae3eac4b8f24a8e6bb0e7795ab613a026d1c80cf096ee2df36cbd8" origin="Generated by Gradle" reason="Artifact is not signed"/>