diff --git a/AdaptiveJetStream/gradle/libs.versions.toml b/AdaptiveJetStream/gradle/libs.versions.toml
index f0021df..f1b27b2 100644
--- a/AdaptiveJetStream/gradle/libs.versions.toml
+++ b/AdaptiveJetStream/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ android-test-plugin = "8.13.0"
 androidx-baselineprofile = "1.4.1"
 benchmark-macro-junit4 = "1.4.1"
 coil-compose = "2.7.0"
-compose-bom = "2025.09.01"
+compose-bom = "2026.01.01"
 concurrent-futures-ktx = "1.3.0"
 tv-material = "1.0.1"
 core-ktx = "1.17.0"
@@ -29,7 +29,7 @@ rules = "1.7.0"
 window = "1.5.0"
 xr = "1.0.0-alpha07"
 xr-material3 = "1.0.0-alpha11"
-screenshot = "0.0.1-alpha12"
+screenshot = "0.0.1-alpha13"
 ui-tooling-preview = "1.10.0"
 ui-tooling = "1.10.0"
 robolectric = "4.16"
diff --git a/AdaptiveJetStream/jetstream/build.gradle.kts b/AdaptiveJetStream/jetstream/build.gradle.kts
index 54807e3..308a774 100644
--- a/AdaptiveJetStream/jetstream/build.gradle.kts
+++ b/AdaptiveJetStream/jetstream/build.gradle.kts
@@ -220,6 +220,6 @@ dependencies {
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
 
-    "screenshotTestImplementation"(libs.screenshot.validation.api)
-    "screenshotTestImplementation"(libs.androidx.compose.ui.tooling)
+    screenshotTestImplementation(libs.screenshot.validation.api)
+    screenshotTestImplementation(libs.androidx.compose.ui.tooling)
 }
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/MainActivity.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/MainActivity.kt
index c7190b1..d194b42 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/MainActivity.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/MainActivity.kt
@@ -52,13 +52,16 @@ class MainActivity : ComponentActivity() {
         setContent {
             JetStreamTheme {
                 CompositionLocalProvider(
+                    // TODO: Shouldn't this be set by JetStreamTheme?
                     LocalContentColor provides MaterialTheme.colorScheme.onSurface
                 ) {
                     App(
+                        // TODO: Figure out why this is being used instead of a BackHandler
                         onActivityBackPressed = onBackPressedDispatcher::onBackPressed,
+                        // TODO: Is it necessary to tell every child that they need to use safe drawing padding?
+                        //  This feels like it would be better declared by the main app layouts rather than being mandated here
                         modifier = Modifier
                             .safeDrawingPadding()
-                            .fillMaxSize()
                     )
                 }
             }
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/App.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/App.kt
index 7834a52..e15401d 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/App.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/App.kt
@@ -16,25 +16,28 @@
 
 package com.google.jetstream.presentation
 
-import androidx.compose.material3.Surface
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.navigation.compose.rememberNavController
 import com.google.jetstream.presentation.app.AppState
-import com.google.jetstream.presentation.app.NavigationComponentType
+import com.google.jetstream.presentation.app.NavigationTree
 import com.google.jetstream.presentation.app.rememberAppState
+import com.google.jetstream.presentation.app.rememberKeyboardShortcuts
 import com.google.jetstream.presentation.app.rememberNavigationComponentType
+import com.google.jetstream.presentation.app.updateTopBarVisibility
 import com.google.jetstream.presentation.app.withNavigationSuiteScaffold.AppWithNavigationSuiteScaffold
-import com.google.jetstream.presentation.app.withNavigationSuiteScaffold.EnableProminentMovieListOverride
 import com.google.jetstream.presentation.app.withSpatialNavigation.AppWithSpatialNavigation
 import com.google.jetstream.presentation.app.withTopBarNavigation.AppWithTopBarNavigation
-import com.google.jetstream.presentation.components.KeyboardShortcut
-import com.google.jetstream.presentation.components.ModifierKey
-import com.google.jetstream.presentation.components.handleKeyboardShortcuts
-import com.google.jetstream.presentation.screens.Screens
+import com.google.jetstream.presentation.components.feature.hasXrSpatialFeature
+import com.google.jetstream.presentation.components.feature.isAutomotiveEnabled
+import com.google.jetstream.presentation.components.feature.isLeanbackEnabled
+import com.google.jetstream.presentation.components.feature.isSpatialUiEnabled
+import com.google.jetstream.presentation.components.feature.isWidthAtLeastLarge
 
 @Composable
 fun App(
@@ -43,92 +46,14 @@ fun App(
     appState: AppState = rememberAppState()
 ) {
     val navController = rememberNavController()
+
     val navigationComponentType = rememberNavigationComponentType()
 
-    val keyboardShortcuts = remember {
-        listOf(
-            KeyboardShortcut(
-                key = Key.Comma,
-                modifierKeys = setOf(ModifierKey.Ctrl),
-                action = {
-                    if (appState.selectedScreen != Screens.Profile) {
-                        navController.navigate(Screens.Profile())
-                    }
-                }
-            ),
-            KeyboardShortcut(
-                key = Key.P,
-                modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
-                action = {
-                    if (appState.selectedScreen != Screens.Profile) {
-                        navController.navigate(Screens.Profile())
-                    }
-                }
-            ),
-            KeyboardShortcut(
-                key = Key.H,
-                modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
-                action = {
-                    if (appState.selectedScreen != Screens.Home) {
-                        navController.navigate(Screens.Home())
-                    }
-                }
-            ),
-            KeyboardShortcut(
-                key = Key.C,
-                modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
-                action = {
-                    if (appState.selectedScreen != Screens.Categories) {
-                        navController.navigate(Screens.Categories())
-                    }
-                }
-            ),
-            KeyboardShortcut(
-                key = Key.M,
-                modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
-                action = {
-                    if (appState.selectedScreen != Screens.Movies) {
-                        navController.navigate(Screens.Movies())
-                    }
-                }
-            ),
-            KeyboardShortcut(
-                key = Key.T,
-                modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
-                action = {
-                    if (appState.selectedScreen != Screens.Shows) {
-                        navController.navigate(Screens.Shows())
-                    }
-                }
-            ),
-            KeyboardShortcut(
-                key = Key.F,
-                modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
-                action = {
-                    if (appState.selectedScreen != Screens.Favourites) {
-                        navController.navigate(Screens.Favourites())
-                    }
-                }
-            ),
-            KeyboardShortcut(
-                key = Key.Slash,
-                action = {
-                    if (appState.selectedScreen != Screens.Search) {
-                        navController.navigate(Screens.Search())
-                    }
-                }
-            ),
-            KeyboardShortcut(
-                key = Key.S,
-                modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
-                action = {
-                    if (appState.selectedScreen != Screens.Search) {
-                        navController.navigate(Screens.Search())
-                    }
-                }
-            ),
-        )
-    }
+    val keyboardShortcuts = rememberKeyboardShortcuts(onSelectScreen = { screen ->
+        if (appState.selectedScreen != screen) {
+            navController.navigate(screen())
+        }
+    })
 
     LaunchedEffect(Unit) {
         navController.addOnDestinationChangedListener { _, destination, _ ->
@@ -140,38 +65,65 @@ fun App(
         appState.updateNavigationComponentType(navigationComponentType)
     }
 
-    when (navigationComponentType) {
-        NavigationComponentType.NavigationSuiteScaffold -> {
-            EnableProminentMovieListOverride {
-                Surface {
-                    AppWithNavigationSuiteScaffold(
-                        appState = appState,
-                        navController = navController,
-                        modifier = modifier.handleKeyboardShortcuts(keyboardShortcuts),
-                    )
-                }
+    // The main content that is displayed on every screen
+    val mainContent = @Composable { padding: PaddingValues ->
+        NavigationTree(
+            navController = navController,
+            isTopBarVisible = appState.isTopBarVisible,
+            modifier = Modifier.padding(padding),
+            onScroll = { updateTopBarVisibility(appState, it) }
+        )
+    }
+
+    val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
+    val isLeanbackEnabled = isLeanbackEnabled()
+    val isAutomotiveEnabled = isAutomotiveEnabled()
+
+    // TODO: Since there no App previews, this seems redundant
+    val isPreview = LocalInspectionMode.current
+    val isSpatialUiEnabled = if (isPreview) {
+        false
+    } else {
+        hasXrSpatialFeature() && isSpatialUiEnabled()
+    }
+    when {
+
+        isSpatialUiEnabled -> {
+            // Android XR 3D environment, also known as Full Space mode.
+            AppWithSpatialNavigation(
+                appState = appState,
+                navController = navController,
+                keyboardShortcuts = keyboardShortcuts,
+                modifier = modifier
+            ) { paddingValues ->
+                mainContent(paddingValues)
             }
         }
-
-        NavigationComponentType.TopBar -> {
-            Surface {
-                AppWithTopBarNavigation(
-                    appState = appState,
-                    onActivityBackPressed = onActivityBackPressed,
-                    navController = navController,
-                    modifier = modifier.handleKeyboardShortcuts(keyboardShortcuts),
-                )
+        isLeanbackEnabled || isAutomotiveEnabled || windowSizeClass.isWidthAtLeastLarge() -> {
+            // TV, Automotive, Large windows on desktop and XR 2D environment (Home space mode).
+            AppWithTopBarNavigation(
+                appState = appState,
+                navController = navController,
+                keyboardShortcuts = keyboardShortcuts,
+                onActivityBackPressed = onActivityBackPressed,
+                modifier = modifier
+            ) { paddingValues ->
+                mainContent(paddingValues)
             }
         }
-
-        NavigationComponentType.Spatial -> {
-            EnableProminentMovieListOverride {
-                AppWithSpatialNavigation(
-                    appState = appState,
-                    navController = navController,
-                    modifier = modifier.handleKeyboardShortcuts(keyboardShortcuts),
-                )
+        else -> {
+            // All other form factors (phone, tablet, foldable etc).
+            AppWithNavigationSuiteScaffold(
+                appState = appState,
+                navController = navController,
+                keyboardShortcuts = keyboardShortcuts,
+                modifier = modifier
+            ) { paddingValues ->
+                mainContent(paddingValues)
             }
         }
     }
 }
+
+
+
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/AppState.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/AppState.kt
index ee2d8c1..66a3007 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/AppState.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/AppState.kt
@@ -36,8 +36,10 @@ class AppState internal constructor(
         private set
 
     var isTopBarFocused by mutableStateOf(false)
+        private set
 
     var isNavigationVisible by mutableStateOf(true)
+        private set
 
     private var navigationComponentType
         by mutableStateOf(NavigationComponentType.NavigationSuiteScaffold)
@@ -69,18 +71,11 @@ class AppState internal constructor(
     }
 
     private fun updateNavigationVisibility() {
-        isNavigationVisible = when (navigationComponentType) {
-            NavigationComponentType.TopBar -> {
-                selectedScreen.navigationVisibility.isVisibleInTopBar
-            }
-            else -> {
-                selectedScreen.navigationVisibility.isVisibleInNavigationSuite
-            }
-        }
+        isNavigationVisible = selectedScreen.shouldShowNavigation(navigationComponentType)
     }
 
     private fun updateSelectedScreen(destination: String) {
-        val screen = Screens.tryFrom(destination) ?: Screens.Home
+        val screen = Screens.tryFrom(destination) ?: error("Could not find screen from $destination")
         updateSelectedScreen(screen)
     }
 
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/Callbacks.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/Callbacks.kt
index 5f54ef2..c3504f5 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/Callbacks.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/Callbacks.kt
@@ -40,6 +40,7 @@ internal fun NavController.openCategoryMovieList() = { categoryId: String ->
     )
 }
 
+// TODO: Could this be refactored to be a method on AppState?
 internal fun updateTopBarVisibility(appState: AppState, updatedVisibility: Boolean) {
     if (updatedVisibility) {
         appState.showTopBar()
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/KeyboardShortcuts.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/KeyboardShortcuts.kt
new file mode 100644
index 0000000..92772a4
--- /dev/null
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/KeyboardShortcuts.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.jetstream.presentation.app
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.input.key.Key
+import com.google.jetstream.presentation.components.KeyboardShortcut
+import com.google.jetstream.presentation.components.ModifierKey
+import com.google.jetstream.presentation.screens.Screens
+
+// TODO: Consider associating the keys and modifier keys with each Screen directly, rather than
+//  having this separate list
+@Composable
+fun rememberKeyboardShortcuts(
+    onSelectScreen: (Screens) -> Unit,
+): List<KeyboardShortcut> = remember {
+    listOf(
+        KeyboardShortcut(
+            key = Key.Comma,
+            modifierKeys = setOf(ModifierKey.Ctrl),
+            action = { onSelectScreen(Screens.Profile) }
+        ),
+        KeyboardShortcut(
+            key = Key.P,
+            modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
+            action = { onSelectScreen(Screens.Profile) }
+        ),
+        KeyboardShortcut(
+            key = Key.H,
+            modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
+            action = { onSelectScreen(Screens.Home) }
+        ),
+        KeyboardShortcut(
+            key = Key.C,
+            modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
+            action = { onSelectScreen(Screens.Categories) }
+        ),
+        KeyboardShortcut(
+            key = Key.M,
+            modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
+            action = { onSelectScreen(Screens.Movies) }
+        ),
+        KeyboardShortcut(
+            key = Key.T,
+            modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
+            action = { onSelectScreen(Screens.Shows) }
+        ),
+        KeyboardShortcut(
+            key = Key.F,
+            modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
+            action = { onSelectScreen(Screens.Favourites) }
+        ),
+        KeyboardShortcut(
+            key = Key.Slash,
+            action = { onSelectScreen(Screens.Search) }
+        ),
+        KeyboardShortcut(
+            key = Key.S,
+            modifierKeys = setOf(ModifierKey.Ctrl, ModifierKey.Alt),
+            action = { onSelectScreen(Screens.Search) }
+        ),
+    )
+}
+
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/NavigationComponentType.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/NavigationComponentType.kt
index fa5e265..16a5f6f 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/NavigationComponentType.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/NavigationComponentType.kt
@@ -37,7 +37,7 @@ fun rememberNavigationComponentType(): NavigationComponentType {
     val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
     val isLeanbackEnabled = isLeanbackEnabled()
     val isAutomotiveEnabled = isAutomotiveEnabled()
-    
+
     val isPreview = LocalInspectionMode.current
     val isSpatialUiEnabled = if (isPreview) {
         false
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/NavigationTree.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/NavigationTree.kt
index bf847da..63ff1fc 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/NavigationTree.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/NavigationTree.kt
@@ -16,6 +16,7 @@
 
 package com.google.jetstream.presentation.app
 
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
@@ -55,7 +56,7 @@ fun NavigationTree(
     NavHost(
         navController = navController,
         startDestination = Home(),
-        modifier = modifier,
+        modifier = modifier.fillMaxSize(),
     ) {
         composable(
             route = CategoryMovieList(),
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/AppWithNavigationSuiteScaffold.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/AppWithNavigationSuiteScaffold.kt
index a9e656f..ee9a9e9 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/AppWithNavigationSuiteScaffold.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/AppWithNavigationSuiteScaffold.kt
@@ -20,21 +20,24 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
 import androidx.compose.material3.adaptive.navigationsuite.rememberNavigationSuiteScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.google.jetstream.presentation.app.AppState
-import com.google.jetstream.presentation.app.NavigationTree
-import com.google.jetstream.presentation.app.updateTopBarVisibility
+import com.google.jetstream.presentation.components.KeyboardShortcut
 import com.google.jetstream.presentation.components.feature.hasXrSpatialFeature
+import com.google.jetstream.presentation.components.handleKeyboardShortcuts
 import com.google.jetstream.presentation.screens.Screens
 
 @Composable
@@ -42,72 +45,98 @@ fun AppWithNavigationSuiteScaffold(
     appState: AppState,
     navController: NavHostController,
     modifier: Modifier = Modifier,
+    keyboardShortcuts: List<KeyboardShortcut> = emptyList(),
+    content: @Composable (PaddingValues) -> Unit
 ) {
-    val navigationSuiteScaffoldState = rememberNavigationSuiteScaffoldState()
-    val screensInGlobalNavigation = remember {
-        Screens.entries.filter { it.isMainNavigation }
-    }
-
-    val hasXrSpatialFeature = hasXrSpatialFeature()
-
-    LaunchedEffect(appState.isNavigationVisible) {
-        if (appState.isNavigationVisible) {
-            navigationSuiteScaffoldState.show()
-        } else {
-            navigationSuiteScaffoldState.hide()
-        }
-    }
-
-    val topBarPaddingTop = remember(hasXrSpatialFeature) {
-        if (hasXrSpatialFeature) {
-            32.dp
-        } else {
-            0.dp
-        }
-    }
-
-    NavigationSuiteScaffold(
-        modifier = modifier,
-        state = navigationSuiteScaffoldState,
-        navigationItemVerticalArrangement = Arrangement.Center,
-        navigationItems = {
-            AdaptiveAppNavigationItems(
-                currentScreen = appState.selectedScreen,
-                screens = screensInGlobalNavigation
-            ) {
-                if (it != appState.selectedScreen) {
-                    navController.navigate(it())
+    EnableProminentMovieListOverride {
+        NavigationSuiteScaffoldLayout(
+            keyboardShortcuts = keyboardShortcuts,
+            modifier = modifier.fillMaxSize(),
+            isNavigationVisible = appState.isNavigationVisible,
+            navigationItems = {
+                AdaptiveAppNavigationItems(
+                    currentScreen = appState.selectedScreen,
+                    screens = Screens.mainNavigationScreens,
+                    onSelectScreen = { screen ->
+                        if (screen != appState.selectedScreen) {
+                            navController.navigate(screen())
+                        }
+                    },
+                )
+                if (hasXrSpatialFeature()) {
+                    RequestFullSpaceModeItem()
                 }
-            }
-            RequestFullSpaceModeItem(hasXrSpatialFeature = hasXrSpatialFeature)
-        }
-    ) {
-        Scaffold(
-            modifier = Modifier.fillMaxSize(),
+            },
+            content = content,
             topBar = {
+                val hasXrSpatialFeature = hasXrSpatialFeature()
+
+                // TODO: This is specific to XR home-space mode
+                val topBarPaddingTop = remember(hasXrSpatialFeature) {
+                    if (hasXrSpatialFeature) {
+                        32.dp
+                    } else {
+                        0.dp
+                    }
+                }
+
                 AnimatedVisibility(
-                    visible = appState.isNavigationVisible,
+                    visible = appState.isNavigationVisible && appState.isTopBarVisible,
                     enter = slideInVertically(),
                     exit = slideOutVertically()
                 ) {
-                    TopBar(
-                        appState = appState,
-                        navController = navController,
-                        modifier = Modifier.padding(
-                            start = 24.dp,
-                            end = 24.dp,
-                            top = topBarPaddingTop
-                        )
+                    TopAppBar(
+                        modifier = Modifier
+                            .padding(
+                                start = 24.dp,
+                                end = 24.dp,
+                                top = topBarPaddingTop
+                            )
+                            .onFocusChanged { appState.updateTopBarFocusState(it.hasFocus) },
+                        selectedScreen = appState.selectedScreen,
+                        showScreen = { screen ->
+                            if (screen != appState.selectedScreen) {
+                                navController.navigate(screen())
+                            }
+                        },
                     )
                 }
             }
-        ) { padding ->
-            NavigationTree(
-                navController = navController,
-                isTopBarVisible = appState.isTopBarVisible,
-                modifier = modifier.padding(padding),
-                onScroll = { updateTopBarVisibility(appState, it) }
-            )
+        )
+    }
+}
+
+@Composable
+fun NavigationSuiteScaffoldLayout(
+    isNavigationVisible: Boolean,
+    modifier: Modifier = Modifier,
+    keyboardShortcuts: List<KeyboardShortcut> = emptyList(),
+    navigationItems: @Composable () -> Unit,
+    content: @Composable ((padding: PaddingValues) -> Unit),
+    topBar: @Composable () -> Unit,
+) {
+    Surface {
+        val navigationSuiteScaffoldState = rememberNavigationSuiteScaffoldState()
+        LaunchedEffect(key1 = isNavigationVisible) {
+            if (isNavigationVisible) {
+                navigationSuiteScaffoldState.show()
+            } else {
+                navigationSuiteScaffoldState.hide()
+            }
+        }
+        NavigationSuiteScaffold(
+            modifier = modifier.handleKeyboardShortcuts(keyboardShortcuts),
+            state = navigationSuiteScaffoldState,
+            navigationItemVerticalArrangement = Arrangement.Center,
+            navigationItems = navigationItems
+        ) {
+            Scaffold(
+                modifier = Modifier.fillMaxSize(),
+                topBar = topBar
+            ) { paddingValues ->
+                content(paddingValues)
+            }
         }
     }
 }
+
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/TopAppBar.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/TopAppBar.kt
index 8f74f14..57cd8a1 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/TopAppBar.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/TopAppBar.kt
@@ -43,6 +43,13 @@ fun TopAppBar(
 ) {
     val (avatar, search) = remember { FocusRequester.createRefs() }
 
+    /**
+     * When the row becomes focussed, automatically focus either the search or profile
+     * composables depending on the current screen.
+     *
+     * TODO: This could be refactored to take a list of
+     *  navigation items rather than a hardcoded list
+     */
     Row(
         verticalAlignment = Alignment.CenterVertically,
         modifier = modifier
@@ -72,7 +79,9 @@ fun TopAppBar(
         Spacer(modifier.weight(1f))
         SearchButton(
             modifier = Modifier.focusRequester(search),
-            onClick = { showScreen(Screens.Search) }
+            onClick = {
+                showScreen(Screens.Search)
+            }
         )
         UserAvatar(
             modifier = Modifier.focusRequester(avatar),
@@ -81,3 +90,5 @@ fun TopAppBar(
         )
     }
 }
+
+
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/TopBar.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/TopBar.kt
deleted file mode 100644
index 6bdfa00..0000000
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/TopBar.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2025 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.jetstream.presentation.app.withNavigationSuiteScaffold
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.navigation.NavController
-import com.google.jetstream.presentation.app.AppState
-
-@Composable
-internal fun TopBar(
-    appState: AppState,
-    navController: NavController,
-    modifier: Modifier = Modifier,
-) {
-    AnimatedVisibility(
-        appState.isTopBarVisible,
-        enter = slideInVertically(),
-        exit = slideOutVertically()
-    ) {
-        TopAppBar(
-            modifier = modifier
-                .onFocusChanged {
-                    appState.updateTopBarFocusState(it.hasFocus)
-                },
-            selectedScreen = appState.selectedScreen,
-            showScreen = {
-                appState.updateSelectedScreen(it)
-                navController.navigate(it())
-            },
-        )
-    }
-}
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/navigationSuiteItems.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/navigationSuiteItems.kt
index ba8e233..40dfcd5 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/navigationSuiteItems.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/navigationSuiteItems.kt
@@ -30,7 +30,6 @@ import androidx.compose.ui.unit.dp
 import androidx.xr.compose.platform.LocalSpatialConfiguration
 import androidx.xr.compose.platform.SpatialConfiguration
 import com.google.jetstream.R
-import com.google.jetstream.presentation.components.feature.hasXrSpatialFeature
 import com.google.jetstream.presentation.screens.Screens
 
 @Composable
@@ -60,28 +59,24 @@ fun AdaptiveAppNavigationItems(
 
 @Composable
 fun RequestFullSpaceModeItem(
-    hasXrSpatialFeature: Boolean = hasXrSpatialFeature(),
     spatialConfiguration: SpatialConfiguration = LocalSpatialConfiguration.current
 ) {
-
-    if (hasXrSpatialFeature) {
-        NavigationSuiteItem(
-            selected = false,
-            onClick = spatialConfiguration::requestFullSpaceMode,
-            icon = {
-                Icon(
-                    imageVector = ImageVector.vectorResource(R.drawable.ic_expand_content),
-                    modifier = Modifier.size(24.dp),
-                    contentDescription = stringResource(R.string.full_space_mode),
-                    tint = MaterialTheme.colorScheme.primary
-                )
-            },
-            label = {
-                Text(
-                    stringResource(R.string.full_space_mode),
-                    color = MaterialTheme.colorScheme.primary
-                )
-            }
-        )
-    }
+    NavigationSuiteItem(
+        selected = false,
+        onClick = spatialConfiguration::requestFullSpaceMode,
+        icon = {
+            Icon(
+                imageVector = ImageVector.vectorResource(R.drawable.ic_expand_content),
+                modifier = Modifier.size(24.dp),
+                contentDescription = stringResource(R.string.full_space_mode),
+                tint = MaterialTheme.colorScheme.primary
+            )
+        },
+        label = {
+            Text(
+                stringResource(R.string.full_space_mode),
+                color = MaterialTheme.colorScheme.primary
+            )
+        }
+    )
 }
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withSpatialNavigation/AppWithSpatialNavigation.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withSpatialNavigation/AppWithSpatialNavigation.kt
index 988a3a3..ac01039 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withSpatialNavigation/AppWithSpatialNavigation.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withSpatialNavigation/AppWithSpatialNavigation.kt
@@ -19,6 +19,8 @@ package com.google.jetstream.presentation.app.withSpatialNavigation
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Icon
@@ -27,11 +29,9 @@ import androidx.compose.material3.NavigationRailItem
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
@@ -52,17 +52,49 @@ import androidx.xr.compose.subspace.layout.width
 import androidx.xr.compose.unit.DpVolumeSize
 import com.google.jetstream.R
 import com.google.jetstream.presentation.app.AppState
-import com.google.jetstream.presentation.app.NavigationTree
-import com.google.jetstream.presentation.app.updateTopBarVisibility
-import com.google.jetstream.presentation.app.withNavigationSuiteScaffold.TopBar
+import com.google.jetstream.presentation.app.withNavigationSuiteScaffold.EnableProminentMovieListOverride
+import com.google.jetstream.presentation.app.withNavigationSuiteScaffold.TopAppBar
+import com.google.jetstream.presentation.components.KeyboardShortcut
+import com.google.jetstream.presentation.components.handleKeyboardShortcuts
 import com.google.jetstream.presentation.screens.Screens
 
-@OptIn(ExperimentalMaterial3XrApi::class)
 @Composable
 fun AppWithSpatialNavigation(
     appState: AppState,
     navController: NavHostController,
+    keyboardShortcuts: List<KeyboardShortcut>,
+    modifier: Modifier,
+    content: @Composable ((padding: PaddingValues) -> Unit)
+) {
+    EnableProminentMovieListOverride {
+        SpatialNavigationLayout(
+            selectedScreen = appState.selectedScreen,
+            isNavigationVisible = appState.isNavigationVisible,
+            isTopBarVisible = appState.isTopBarVisible,
+            onShowScreen = { screen ->
+                navController.navigate(screen())
+            },
+            onTopBarFocusChanged = { appState.updateTopBarFocusState(it) },
+            containerColor = appState.selectedScreen.xrContainerColor(),
+            modifier = modifier.fillMaxSize().handleKeyboardShortcuts(keyboardShortcuts)
+        ) { paddingValues ->
+            content(paddingValues)
+        }
+    }
+}
+
+
+@OptIn(ExperimentalMaterial3XrApi::class)
+@Composable
+fun SpatialNavigationLayout(
+    selectedScreen: Screens,
+    isNavigationVisible: Boolean,
+    isTopBarVisible: Boolean,
+    onShowScreen: (Screens) -> Unit,
+    onTopBarFocusChanged: (Boolean) -> Unit,
+    containerColor: Color,
     modifier: Modifier = Modifier,
+    content: @Composable (PaddingValues) -> Unit
 ) {
     val resizePolicy = remember {
         ResizePolicy(minimumSize = DpVolumeSize(800.dp, 800.dp, 0.dp))
@@ -71,24 +103,6 @@ fun AppWithSpatialNavigation(
         MovePolicy()
     }
 
-    val screensInGlobalNavigation = remember {
-        Screens.entries.filter { it.isMainNavigation }
-    }
-
-    // Workaround to make video player visible.
-    val defaultContainerColor = MaterialTheme.colorScheme.background
-    var containerColor by remember {
-        mutableStateOf(defaultContainerColor)
-    }
-    navController.addOnDestinationChangedListener { _, destination, _ ->
-        val isVideoPlayer = destination.route?.startsWith(Screens.VideoPlayer.name) ?: false
-        containerColor = if (isVideoPlayer) {
-            Color.Transparent
-        } else {
-            defaultContainerColor
-        }
-    }
-
     ApplicationSubspace {
         SpatialPanel(
             resizePolicy = resizePolicy,
@@ -98,36 +112,33 @@ fun AppWithSpatialNavigation(
             Scaffold(
                 topBar = {
                     AnimatedVisibility(
-                        visible = appState.isNavigationVisible,
+                        visible = isTopBarVisible,
                         enter = slideInVertically(),
                         exit = slideOutVertically()
                     ) {
-                        TopBar(
-                            appState = appState,
-                            navController = navController,
-                            modifier = Modifier.padding(
-                                start = 24.dp,
-                                end = 24.dp,
-                                top = 32.dp
-                            )
+                        TopAppBar(
+                            selectedScreen = selectedScreen,
+                            showScreen = { onShowScreen(it) },
+                            modifier = Modifier
+                                .padding(
+                                    start = 24.dp,
+                                    end = 24.dp,
+                                    top = 32.dp
+                                )
+                                .onFocusChanged { onTopBarFocusChanged(it.hasFocus) },
                         )
                     }
                 },
                 containerColor = containerColor,
+                modifier = modifier,
             ) { padding ->
-                NavigationTree(
-                    navController = navController,
-                    isTopBarVisible = appState.isTopBarVisible,
-                    modifier = modifier.padding(padding),
-                    onScroll = { updateTopBarVisibility(appState, it) }
-                )
+                content(padding)
             }
-            AnimatedVisibility(appState.isNavigationVisible) {
+            AnimatedVisibility(isNavigationVisible) {
                 NavigationInObiter(
-                    screens = screensInGlobalNavigation,
-                    currentScreen = appState.selectedScreen
+                    screens = Screens.mainNavigationScreens, currentScreen = selectedScreen
                 ) {
-                    navController.navigate(it())
+                    onShowScreen(it)
                 }
             }
         }
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withTopBarNavigation/AppWithTopBarNavigation.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withTopBarNavigation/AppWithTopBarNavigation.kt
index 6e706e5..d594bf1 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withTopBarNavigation/AppWithTopBarNavigation.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withTopBarNavigation/AppWithTopBarNavigation.kt
@@ -18,7 +18,10 @@ package com.google.jetstream.presentation.app.withTopBarNavigation
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -28,8 +31,8 @@ import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.google.jetstream.presentation.app.AppState
-import com.google.jetstream.presentation.app.NavigationTree
-import com.google.jetstream.presentation.app.updateTopBarVisibility
+import com.google.jetstream.presentation.components.KeyboardShortcut
+import com.google.jetstream.presentation.components.handleKeyboardShortcuts
 import com.google.jetstream.presentation.components.onBackButtonPressed
 import com.google.jetstream.presentation.components.shim.tryRequestFocus
 import com.google.jetstream.presentation.screens.Screens
@@ -38,30 +41,78 @@ import com.google.jetstream.presentation.screens.Screens
 fun AppWithTopBarNavigation(
     appState: AppState,
     navController: NavHostController,
+    keyboardShortcuts: List<KeyboardShortcut>,
     onActivityBackPressed: () -> Unit,
     modifier: Modifier = Modifier,
+    content: @Composable ((padding: PaddingValues) -> Unit)
+) {
+    Surface {
+        TopBarWithNavigationLayout(
+            selectedScreen = appState.selectedScreen,
+            isNavigationVisible = appState.isNavigationVisible,
+            isTopBarVisible = appState.isNavigationVisible && appState.isTopBarVisible,
+            isTopBarFocussed = appState.isTopBarFocused,
+            onTopBarFocusChanged = { hasFocus ->
+                appState.updateTopBarFocusState(hasFocus)
+            },
+            onTopBarVisible = { appState.showTopBar() },
+            onActivityBackPressed = onActivityBackPressed,
+            onShowScreen = { screen ->
+                navController.navigate(screen())
+            },
+            modifier = modifier.fillMaxSize().handleKeyboardShortcuts(keyboardShortcuts),
+        ) {
+            // TODO: This is to keep things consistent with the other layouts, however,
+            //  we should consider whether it's necessary to always apply padding to the
+            //  main content
+            content(PaddingValues(0.dp))
+        }
+    }
+}
+
+@Composable
+fun TopBarWithNavigationLayout(
+    selectedScreen: Screens,
+    isNavigationVisible: Boolean,
+    isTopBarVisible: Boolean,
+    isTopBarFocussed: Boolean,
+    onTopBarVisible: () -> Unit,
+    onTopBarFocusChanged: (Boolean) -> Unit,
+    onShowScreen: (Screens) -> Unit,
+    onActivityBackPressed: () -> Unit,
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit,
 ) {
-    val items = remember { Screens.entries.filter { it.isTabItem } }
     val topBar = remember { FocusRequester() }
 
     Column(
         modifier = modifier.onBackButtonPressed {
             when {
-                !appState.isNavigationVisible -> {
+                // TODO: This logic is difficult to understand and should be refactored
+                // The VideoPlayer screen doesn't have any navigation
+                // The MovieDetails screen doesn't have any navigation when it's displayed in a
+                // TopBar layout.
+                // These are the only two scenarios where appState.isNavigationVisible is false
+                !isNavigationVisible -> {
                     onActivityBackPressed()
                 }
 
-                !appState.isTopBarVisible -> {
-                    appState.showTopBar()
+                // If the top bar isn't visible then show it - my guess is this is to handle
+                // the case where the user has scrolled down and the top menu has disappeared.
+                // When testing this on the TV emulator, the app just quits when I tap back.
+                !isTopBarVisible -> {
+                    onTopBarVisible()
                     topBar.tryRequestFocus()
                 }
 
-                !appState.isTopBarFocused -> {
+                // If the top bar isn't focussed then focus it
+                !isTopBarFocussed -> {
                     topBar.tryRequestFocus()
                 }
 
-                appState.selectedScreen != Screens.Home -> {
-                    navController.navigate(Screens.Home())
+                // It feels strange to be doing conditional navigation here
+                selectedScreen != Screens.Home -> {
+                    onShowScreen(Screens.Home)
                 }
 
                 else -> {
@@ -70,16 +121,14 @@ fun AppWithTopBarNavigation(
             }
         }
     ) {
-        AnimatedVisibility(
-            appState.isNavigationVisible &&
-                appState.isTopBarVisible
-        ) {
+        // TODO: Consider refactoring this into a slot
+        AnimatedVisibility(isTopBarVisible) {
             TopBar(
-                items,
-                appState.selectedScreen,
+                Screens.tabScreens,
+                selectedScreen,
                 {
-                    if (it != appState.selectedScreen) {
-                        navController.navigate(it())
+                    if (it != selectedScreen) {
+                        onShowScreen(it)
                     }
                 },
                 modifier = Modifier
@@ -88,15 +137,9 @@ fun AppWithTopBarNavigation(
                         horizontal = 74.dp,
                     )
                     .focusRequester(topBar)
-                    .onFocusChanged {
-                        appState.updateTopBarFocusState(it.hasFocus)
-                    }
+                    .onFocusChanged { onTopBarFocusChanged(it.hasFocus) }
             )
         }
-        NavigationTree(
-            navController = navController,
-            isTopBarVisible = appState.isTopBarVisible,
-            onScroll = { updateTopBarVisibility(appState, it) }
-        )
+        content()
     }
 }
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withTopBarNavigation/TopBar.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withTopBarNavigation/TopBar.kt
index 652866d..25a77c8 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withTopBarNavigation/TopBar.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withTopBarNavigation/TopBar.kt
@@ -59,18 +59,21 @@ import com.google.jetstream.presentation.screens.Screens
 internal fun TopBar(
     items: List<Screens>,
     selectedScreen: Screens,
-    showScreen: (Screens) -> Unit,
+    onShowScreen: (Screens) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val focusManager = LocalFocusManager.current
     val (tabRow, avatar) = remember { FocusRequester.createRefs() }
 
     val isDpadAvailable = isDpadAvailable()
+
+    // TODO: Is this a bug?
+    // If I run the app on the TV emulator, nothing happens when I click on the top navigation items
     val onClickHandler: (Screens) -> Unit = remember(isDpadAvailable) {
         if (isDpadAvailable) {
             { focusManager.moveFocus(FocusDirection.Down) }
         } else {
-            { it -> showScreen(it) }
+            { onShowScreen(it) }
         }
     }
 
@@ -98,14 +101,14 @@ internal fun TopBar(
                     }
                     .focusRequester(avatar),
                 selected = selectedScreen == Screens.Profile,
-                onClick = { showScreen(Screens.Profile) }
+                onClick = { onShowScreen(Screens.Profile) }
             )
         }
         TopBarTabRow(
             tabs = items,
             selectedScreen = selectedScreen,
             onClick = onClickHandler,
-            onTabSelected = showScreen,
+            onTabSelected = onShowScreen,
             modifier = Modifier
                 .weight(1f)
                 .focusRequester(tabRow)
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/components/JetStreamPreview.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/components/JetStreamPreview.kt
index 529dad2..73fa094 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/components/JetStreamPreview.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/components/JetStreamPreview.kt
@@ -16,6 +16,7 @@
 
 package com.google.jetstream.presentation.components
 
+import android.content.res.Configuration
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -26,29 +27,33 @@ import com.google.jetstream.data.entities.MovieCategory
 import com.google.jetstream.presentation.screens.categories.CategoriesScreenUiState
 import com.google.jetstream.presentation.theme.JetStreamTheme
 
-@Preview(device = Devices.PHONE, name = "Phone preview")
+@Preview(device = Devices.PHONE, name = "Phone_Light", uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(device = Devices.PHONE, name = "Phone_Dark", uiMode = Configuration.UI_MODE_NIGHT_YES)
 annotation class PhonePreview
 
-@Preview(device = Devices.FOLDABLE, name = "Foldable preview")
+@Preview(device = Devices.FOLDABLE, name = "Foldable")
 annotation class FoldablePreview
 
-@Preview(device = Devices.TABLET, name = "Tablet preview")
+@Preview(device = Devices.TABLET, name = "Tablet_Light", uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(device = Devices.TABLET, name = "Tablet_Dark", uiMode = Configuration.UI_MODE_NIGHT_YES)
 annotation class TabletPreview
 
-@Preview(device = Devices.DESKTOP, name = "Desktop preview")
+@Preview(device = Devices.DESKTOP, name = "Desktop")
 annotation class DesktopPreview
 
-@Preview(device = Devices.TV_1080p, name = "TV Preview")
+@Preview(device = Devices.TV_1080p, name = "TV")
 annotation class TvPreview
 
+@Preview(device = Devices.AUTOMOTIVE_1024p, name = "Auto_Light", uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(device = Devices.AUTOMOTIVE_1024p, name = "Auto_Dark", uiMode = Configuration.UI_MODE_NIGHT_YES)
+annotation class AutoPreview
+
+@PhonePreview
 @FoldablePreview
 @TabletPreview
 @DesktopPreview
 @TvPreview
-annotation class LargeScreensPreview
-
-@PhonePreview
-@LargeScreensPreview
+@AutoPreview
 annotation class AdaptivePreview
 
 @Composable
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/components/feature/WindowSizeClass.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/components/feature/WindowSizeClass.kt
index 049823c..d83141b 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/components/feature/WindowSizeClass.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/components/feature/WindowSizeClass.kt
@@ -34,6 +34,3 @@ fun WindowSizeClass.isWidthAtLeastExpanded(): Boolean {
 fun WindowSizeClass.isWidthAtLeastLarge(): Boolean {
     return isWidthAtLeastBreakpoint(WindowSizeClass.WIDTH_DP_LARGE_LOWER_BOUND)
 }
-
-val WindowSizeClass.Companion.WIDTH_DP_LARGE_LOWER_BOUND: Int
-    get() = 1200
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/screens/Screens.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/screens/Screens.kt
index e662982..a4f349d 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/screens/Screens.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/screens/Screens.kt
@@ -20,21 +20,43 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.IntRange
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import com.google.jetstream.R
 import com.google.jetstream.data.convert.TryFrom
+import com.google.jetstream.presentation.app.NavigationComponentType
 import com.google.jetstream.presentation.screens.categories.CategoryMovieListScreen
 import com.google.jetstream.presentation.screens.moviedetails.MovieDetailsScreen
 import com.google.jetstream.presentation.screens.videoPlayer.VideoPlayerScreen
 
+/**
+ * Represents a screen.
+ *
+ * @param args - The navigation arguments for the screen.
+ * @param isTabItem - indicates whether this screen's icon can appear in a tab.
+ * @param isMainNavigation - indicates whether this is a top level screen that will appear in the
+ * main navigation area.
+ * @param tabIcon - The icon to be shown in the tab. Only applicable if this is a tab item.
+ * @param shouldShowNavigation - A function that indicates whether the navigation area should be
+ * shown for the given `NavigationComponentType`.
+ * @param navIcon - The icon to be shown in the navigation area. Only applicable if this is a main
+ * navigation item.
+ * // TODO: Remove this XR-specific field if possible
+ * @param xrContainerColor - Overrides the default screen container color on XR layouts
+ */
 enum class Screens(
     private val args: List<String>? = null,
     val isTabItem: Boolean = false,
     val isMainNavigation: Boolean = false,
+    // TODO: Can we remove either tabIcon or navIcon?
     val tabIcon: ImageVector? = null,
-    val navigationVisibility: NavigationVisibility = NavigationVisibility.Visible,
-    @DrawableRes val navIcon: Int = 0
+    val shouldShowNavigation: (NavigationComponentType) -> Boolean = { true },
+    @DrawableRes val navIcon: Int = 0,
+    val xrContainerColor: Color? = null
 ) {
+
     Profile,
     Home(isTabItem = true, isMainNavigation = true, navIcon = R.drawable.ic_home),
     Categories(isTabItem = true, isMainNavigation = true, navIcon = R.drawable.ic_category),
@@ -44,12 +66,15 @@ enum class Screens(
     Search(isTabItem = true, tabIcon = Icons.Default.Search, navIcon = R.drawable.ic_search),
     CategoryMovieList(listOf(CategoryMovieListScreen.CategoryIdBundleKey)),
     MovieDetails(
-        listOf(MovieDetailsScreen.MOVIE_ID_BUNDLE_KEY),
-        navigationVisibility = NavigationVisibility.VisibleInNavigationSuite
+        args = listOf(MovieDetailsScreen.MOVIE_ID_BUNDLE_KEY),
+        // Don't show the navigation in the top bar
+        shouldShowNavigation = { it != NavigationComponentType.TopBar }
     ),
     VideoPlayer(
         listOf(VideoPlayerScreen.MOVIE_ID_BUNDLE_KEY),
-        navigationVisibility = NavigationVisibility.Hidden
+        shouldShowNavigation = { false },
+        // Workaround to make video player visible.
+        xrContainerColor = Color.Transparent
     );
 
     operator fun invoke(): String {
@@ -94,23 +119,12 @@ enum class Screens(
                 else -> null
             }
         }
+
+        val tabScreens: List<Screens> = Screens.entries.filter { it.isTabItem }
+        val mainNavigationScreens: List<Screens> = Screens.entries.filter { it.isMainNavigation }
     }
-}
 
-sealed interface NavigationVisibility {
-    val isVisibleInNavigationSuite: Boolean
-    val isVisibleInTopBar: Boolean
+    @Composable
+    fun xrContainerColor() : Color = xrContainerColor ?: MaterialTheme.colorScheme.background
 
-    data object Visible : NavigationVisibility {
-        override val isVisibleInNavigationSuite = true
-        override val isVisibleInTopBar = true
-    }
-    data object Hidden : NavigationVisibility {
-        override val isVisibleInNavigationSuite = false
-        override val isVisibleInTopBar = false
-    }
-    data object VisibleInNavigationSuite : NavigationVisibility {
-        override val isVisibleInNavigationSuite = true
-        override val isVisibleInTopBar = false
-    }
 }
diff --git a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/theme/Theme.kt b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/theme/Theme.kt
index fc2c981..cc14f49 100644
--- a/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/theme/Theme.kt
+++ b/AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/theme/Theme.kt
@@ -27,6 +27,7 @@ import com.google.jetstream.presentation.screens.categories.LocalCategoryGridGri
 fun JetStreamTheme(
     content: @Composable () -> Unit
 ) {
+    // TODO: Consider refactoring this
     CompositionLocalProvider(
         LocalFeaturedCarouselHeight provides rememberFeaturedCarouselHeight(),
         LocalVerticalCardAspectRatio provides rememberVerticalCardAspectRatio(),
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTest/kotlin/com/google/jetstream/presentation/components/ComponentScreenshotTests.kt b/AdaptiveJetStream/jetstream/src/screenshotTest/kotlin/com/google/jetstream/presentation/components/ComponentScreenshotTests.kt
index 347326d..dde0cb9 100644
--- a/AdaptiveJetStream/jetstream/src/screenshotTest/kotlin/com/google/jetstream/presentation/components/ComponentScreenshotTests.kt
+++ b/AdaptiveJetStream/jetstream/src/screenshotTest/kotlin/com/google/jetstream/presentation/components/ComponentScreenshotTests.kt
@@ -28,8 +28,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.xr.compose.platform.SpatialConfiguration
 import com.android.tools.screenshot.PreviewTest
 import com.google.jetstream.presentation.app.UserAvatar
+import com.google.jetstream.presentation.app.withNavigationSuiteScaffold.RequestFullSpaceModeItem
+import com.google.jetstream.presentation.app.withNavigationSuiteScaffold.TopAppBar
+import com.google.jetstream.presentation.screens.Screens
 
 @PreviewTest
 @Preview
@@ -118,3 +122,21 @@ fun UserAvatarScreenshot() {
         }
     }
 }
+
+@PreviewTest
+@Preview
+@Composable
+fun TopAppBarPreview(){
+    TopAppBar(
+        selectedScreen = Screens.Home,
+        showScreen = {},
+    )
+}
+
+@PreviewTest
+@Preview
+@Composable
+fun RequestFullSpaceModeItemPreview(){
+    RequestFullSpaceModeItem(spatialConfiguration = object : SpatialConfiguration {})
+}
+
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTest/kotlin/com/google/jetstream/presentation/screens/ScreenScreenshotTests.kt b/AdaptiveJetStream/jetstream/src/screenshotTest/kotlin/com/google/jetstream/presentation/screens/ScreenScreenshotTests.kt
index 15bdfb1..165e3fc 100644
--- a/AdaptiveJetStream/jetstream/src/screenshotTest/kotlin/com/google/jetstream/presentation/screens/ScreenScreenshotTests.kt
+++ b/AdaptiveJetStream/jetstream/src/screenshotTest/kotlin/com/google/jetstream/presentation/screens/ScreenScreenshotTests.kt
@@ -17,23 +17,37 @@
 package com.google.jetstream.presentation.screens
 
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.unit.dp
 import com.android.tools.screenshot.PreviewTest
+import com.google.jetstream.presentation.app.AppState
+import com.google.jetstream.presentation.app.withNavigationSuiteScaffold.AdaptiveAppNavigationItems
+import com.google.jetstream.presentation.app.withNavigationSuiteScaffold.NavigationSuiteScaffoldLayout
+import com.google.jetstream.presentation.app.withNavigationSuiteScaffold.TopAppBar
+import com.google.jetstream.presentation.app.withTopBarNavigation.TopBarWithNavigationLayout
 import com.google.jetstream.presentation.components.AdaptivePreview
+import com.google.jetstream.presentation.components.AutoPreview
+import com.google.jetstream.presentation.components.DesktopPreview
+import com.google.jetstream.presentation.components.FoldablePreview
 import com.google.jetstream.presentation.components.JetStreamPreview
+import com.google.jetstream.presentation.components.PhonePreview
+import com.google.jetstream.presentation.components.TabletPreview
+import com.google.jetstream.presentation.components.TvPreview
 import com.google.jetstream.presentation.components.mockCategoryScreenState
-import com.google.jetstream.presentation.screens.categories.Catalog as CategoriesCatalog
 import com.google.jetstream.presentation.screens.categories.CategoryDetails
-import com.google.jetstream.presentation.screens.favourites.Catalog as FavouritesCatalog
 import com.google.jetstream.presentation.screens.favourites.FavouriteScreenViewModel
 import com.google.jetstream.presentation.screens.favourites.FilterList
-import com.google.jetstream.presentation.screens.home.Catalog as HomeCatalog
 import com.google.jetstream.presentation.screens.moviedetails.MovieDetailsList
-import com.google.jetstream.presentation.screens.movies.Catalog as MoviesCatalog
 import com.google.jetstream.presentation.screens.search.SearchResult
+import com.google.jetstream.presentation.screens.categories.Catalog as CategoriesCatalog
+import com.google.jetstream.presentation.screens.favourites.Catalog as FavouritesCatalog
+import com.google.jetstream.presentation.screens.home.Catalog as HomeCatalog
+import com.google.jetstream.presentation.screens.movies.Catalog as MoviesCatalog
 import com.google.jetstream.presentation.screens.shows.Catalog as ShowsCatalog
 
 @PreviewTest
@@ -177,3 +191,62 @@ fun SearchScreenScreenshot() {
         }
     }
 }
+
+@PreviewTest
+@PhonePreview
+@TabletPreview
+@FoldablePreview
+@Composable
+fun NavigationSuiteScaffoldLayoutPreview() {
+    val appState = AppState()
+
+    NavigationSuiteScaffoldLayout(
+        isNavigationVisible = true,
+        navigationItems = {
+            AdaptiveAppNavigationItems(
+                currentScreen = Screens.Home,
+                screens = Screens.entries.filter { it.isMainNavigation },
+                onSelectScreen = {}
+            )
+        },
+        content = { padding ->
+            Text("Preview content", modifier = Modifier.padding(padding))
+        },
+        topBar = {
+            TopAppBar(
+                modifier = Modifier
+                    .padding(
+                        start = 24.dp,
+                        end = 24.dp,
+                        top = 0.dp
+                    ),
+                selectedScreen = appState.selectedScreen,
+                showScreen = { },
+            )
+        }
+    )
+}
+
+
+@PreviewTest
+@DesktopPreview
+@TvPreview
+@AutoPreview
+@Composable
+fun TopBarWithNavigationLayoutPreview() {
+    val appState = AppState()
+    TopBarWithNavigationLayout(
+        selectedScreen = appState.selectedScreen,
+        isNavigationVisible = appState.isNavigationVisible,
+        isTopBarVisible = appState.isNavigationVisible && appState.isTopBarVisible,
+        isTopBarFocussed = appState.isTopBarFocused,
+        onTopBarFocusChanged = { hasFocus ->
+            appState.updateTopBarFocusState(hasFocus)
+        },
+        onTopBarVisible = { appState.showTopBar() },
+        onActivityBackPressed = { },
+        onShowScreen = {},
+    ) {
+        Text("Preview content")
+    }
+}
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/components/ComponentScreenshotTestsKt/RequestFullSpaceModeItemPreview_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/components/ComponentScreenshotTestsKt/RequestFullSpaceModeItemPreview_0.png
new file mode 100644
index 0000000..0ec87a4
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/components/ComponentScreenshotTestsKt/RequestFullSpaceModeItemPreview_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/components/ComponentScreenshotTestsKt/TopAppBarPreview_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/components/ComponentScreenshotTestsKt/TopAppBarPreview_0.png
new file mode 100644
index 0000000..7796b15
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/components/ComponentScreenshotTestsKt/TopAppBarPreview_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/components/ComponentScreenshotTestsKt/TopBarPreview_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/components/ComponentScreenshotTestsKt/TopBarPreview_0.png
new file mode 100644
index 0000000..7796b15
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/components/ComponentScreenshotTestsKt/TopBarPreview_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..f2755a4
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..f2755a4
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..f2755a4
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..09109c3
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..09109c3
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..c4b86a2
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..c4b86a2
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoriesScreenScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..cd6aa75
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..cd6aa75
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..cd6aa75
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..5cc3a3f
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..5cc3a3f
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..9d2ec83
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..9d2ec83
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/CategoryMovieListScreenScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..ba0fcc4
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..f0a3653
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..f0a3653
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..b5b03e5
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..1963581
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Tablet_Dark_6bab40a5_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Tablet_Dark_6bab40a5_0.png
new file mode 100644
index 0000000..4c930ed
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Tablet_Dark_6bab40a5_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Tablet_Light_50679046_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Tablet_Light_50679046_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..7fcbcd5
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/FavouritesScreenScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..7169513
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..7169513
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..7169513
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..7a2e3f4
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..7a2e3f4
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..40c75a0
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..40c75a0
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/HomeScreenScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..4b8534c
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..4b8534c
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..4b8534c
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..18a83a0
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..18a83a0
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..fa1e99e
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..fa1e99e
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MovieDetailsScreenScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..d5091df
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..d5091df
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..d5091df
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..7242946
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..7242946
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..343f4d8
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..343f4d8
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/MoviesScreenScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Foldable_afbab3e4_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Foldable_afbab3e4_0.png
new file mode 100644
index 0000000..54c997c
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Foldable_afbab3e4_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Phone_2e325909_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Phone_2e325909_0.png
new file mode 100644
index 0000000..4a825ed
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Phone_2e325909_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..4a825ed
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..4a825ed
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Tablet_Dark_6bab40a5_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Tablet_Dark_6bab40a5_0.png
new file mode 100644
index 0000000..9867426
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Tablet_Dark_6bab40a5_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..9867426
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..9867426
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/NavigationSuiteScaffoldLayoutPreview_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..4eeb685
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..ff40f1a
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..ff40f1a
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..586994e
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..d8ba739
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Tablet_Dark_6bab40a5_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Tablet_Dark_6bab40a5_0.png
new file mode 100644
index 0000000..be300a3
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Tablet_Dark_6bab40a5_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Tablet_Light_50679046_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Tablet_Light_50679046_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..cbf3f4e
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/SearchScreenScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..67bf39b
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..67bf39b
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..67bf39b
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..2e85495
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..2e85495
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..af40039
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..af40039
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/ShowsScreenScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..557a055
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..557a055
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..557a055
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Desktop_4686fd94_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Desktop_4686fd94_0.png
new file mode 100644
index 0000000..8f15238
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_Desktop_4686fd94_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_TV_0177f2ae_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_TV_0177f2ae_0.png
new file mode 100644
index 0000000..80c5ce1
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/ScreenScreenshotTestsKt/TopBarWithNavigationLayoutPreview_TV_0177f2ae_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..ca0b993
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..ca0b993
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..ca0b993
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..f25da60
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..f25da60
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..2fc5705
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..2fc5705
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AboutSectionScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..f8b6dc3
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..f8b6dc3
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..f8b6dc3
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..037d6ad
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..037d6ad
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..f99103d
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..f99103d
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/AccountsSectionScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..2dfb2cb
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..2dfb2cb
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..2dfb2cb
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..cd416d8
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..cd416d8
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..cda0a62
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..cda0a62
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/HelpAndSupportSectionScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..8e5686a
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..8e5686a
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..8e5686a
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..08c303b
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..08c303b
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..7a5bd4f
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..7a5bd4f
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/LanguageSectionScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..3ac4ece
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..3ac4ece
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..3ac4ece
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..f319be9
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..f319be9
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..0b9d70d
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..0b9d70d
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SearchHistorySectionScreenshot_Tablet_d6f36a9e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Auto_Dark_cfefd791_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Auto_Dark_cfefd791_0.png
new file mode 100644
index 0000000..0451879
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Auto_Dark_cfefd791_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Auto_Light_1ae03476_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Auto_Light_1ae03476_0.png
new file mode 100644
index 0000000..0451879
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Auto_Light_1ae03476_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Auto_abfe24f9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Auto_abfe24f9_0.png
new file mode 100644
index 0000000..0451879
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Auto_abfe24f9_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Desktop preview_995fc4f1_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Desktop_4686fd94_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Desktop preview_995fc4f1_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Desktop_4686fd94_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Foldable preview_3e81e840_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Foldable_afbab3e4_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Foldable preview_3e81e840_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Foldable_afbab3e4_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Phone preview_11146b2a_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Phone_2e325909_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Phone preview_11146b2a_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Phone_2e325909_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Phone_Dark_c1f6058e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Phone_Dark_c1f6058e_0.png
new file mode 100644
index 0000000..e1c24f1
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Phone_Dark_c1f6058e_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Phone_Light_7a79d74c_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Phone_Light_7a79d74c_0.png
new file mode 100644
index 0000000..e1c24f1
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Phone_Light_7a79d74c_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_TV Preview_aa53abf9_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_TV_0177f2ae_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_TV Preview_aa53abf9_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_TV_0177f2ae_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Tablet preview_c69fa617_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Tablet_Dark_6bab40a5_0.png
similarity index 100%
rename from AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Tablet preview_c69fa617_0.png
rename to AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Tablet_Dark_6bab40a5_0.png
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Tablet_Light_50679046_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Tablet_Light_50679046_0.png
new file mode 100644
index 0000000..a096550
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Tablet_Light_50679046_0.png differ
diff --git a/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Tablet_d6f36a9e_0.png b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Tablet_d6f36a9e_0.png
new file mode 100644
index 0000000..a096550
Binary files /dev/null and b/AdaptiveJetStream/jetstream/src/screenshotTestDebug/reference/com/google/jetstream/presentation/screens/profile/ProfileScreenshotTestsKt/SubtitlesSectionScreenshot_Tablet_d6f36a9e_0.png differ