Cherry pick fixes

app/src/main/java/exh/debug/SettingsDebugController.kt

@@ -52,7 +52,7 @@ import eu.kanade.presentation.components.ScrollbarLazyColumn
 import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
 import eu.kanade.presentation.more.settings.widget.TrailingWidgetBuffer
 import eu.kanade.presentation.util.plus
-import eu.kanade.presentation.util.topPaddingValues
+import eu.kanade.presentation.util.topSmallPaddingValues
 import eu.kanade.tachiyomi.ui.base.controller.BasicFullComposeController
 import exh.util.capitalize
 import kotlinx.coroutines.Dispatchers
@@ -116,7 +116,7 @@ class SettingsDebugController : BasicFullComposeController() {
                 Modifier.fillMaxSize(),
                 contentPadding = paddingValues +
                     WindowInsets.navigationBars.only(WindowInsetsSides.Vertical).asPaddingValues() +
-                    topPaddingValues,
+                    topSmallPaddingValues,
             ) {
                 item {
                     Text(

app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt

@@ -38,7 +38,7 @@ import eu.kanade.presentation.components.Scaffold
 import eu.kanade.presentation.components.ScrollbarLazyColumn
 import eu.kanade.presentation.manga.components.PagePreview
 import eu.kanade.presentation.util.plus
-import eu.kanade.presentation.util.topPaddingValues
+import eu.kanade.presentation.util.topSmallPaddingValues
 import eu.kanade.tachiyomi.R
 import exh.pagepreview.PagePreviewState
 import exh.util.floor
@@ -84,7 +84,7 @@ fun PagePreviewScreen(
                     ScrollbarLazyColumn(
                         state = lazyListState,
                         modifier = Modifier,
-                        contentPadding = paddingValues + topPaddingValues,
+                        contentPadding = paddingValues + topSmallPaddingValues,
                         verticalArrangement = Arrangement.spacedBy(8.dp),
                     ) {
                         items(items) {

app/src/main/java/exh/ui/metadata/MetadataViewController.kt

@@ -29,7 +29,7 @@ import eu.kanade.presentation.components.Scaffold
 import eu.kanade.presentation.components.ScrollbarLazyColumn
 import eu.kanade.presentation.util.clickableNoIndication
 import eu.kanade.presentation.util.plus
-import eu.kanade.presentation.util.topPaddingValues
+import eu.kanade.presentation.util.topSmallPaddingValues
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
@@ -86,7 +86,7 @@ class MetadataViewController : FullComposeController<MetadataViewPresenter> {
                     val context = LocalContext.current
                     val items = remember(state.meta) { state.meta.getExtraInfoPairs(context) }
                     ScrollbarLazyColumn(
-                        contentPadding = paddingValues + WindowInsets.navigationBars.asPaddingValues() + topPaddingValues,
+                        contentPadding = paddingValues + WindowInsets.navigationBars.asPaddingValues() + topSmallPaddingValues,
                     ) {
                         items(items) { (title, text) ->
                             Row(