Dependency updates

(cherry picked from commit eef39b75a6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt

app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt

@@ -16,10 +16,10 @@ import androidx.preference.PreferenceGroupAdapter
 import androidx.preference.PreferenceManager
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
+import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.DividerItemDecoration.VERTICAL
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.MergeAdapter
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.EmptyPreferenceDataStore
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@@ -83,7 +83,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
         val context = view.context
 
         binding.extensionPrefsRecycler.layoutManager = LinearLayoutManager(context)
-        binding.extensionPrefsRecycler.adapter = MergeAdapter(
+        binding.extensionPrefsRecycler.adapter = ConcatAdapter(
             ExtensionDetailsHeaderAdapter(presenter),
             initPreferencesAdapter(context, extension)
         )

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.MergeAdapter
+import androidx.recyclerview.widget.ConcatAdapter
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.chip.Chip
 import eu.davidea.flexibleadapter.FlexibleAdapter
@@ -88,7 +88,7 @@ class SourceFilterSheet(
 
         init {
             // SY -->
-            recycler.adapter = MergeAdapter(savedSearchesAdapter, adapter)
+            recycler.adapter = ConcatAdapter(savedSearchesAdapter, adapter)
             // SY <--
             recycler.setHasFixedSize(true)
             val view = inflate(R.layout.source_filter_sheet)