diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,NEXUS_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,NEXUS_5,1.5].png
deleted file mode 100644
index 4b98592df..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,NEXUS_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,NEXUS_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,NEXUS_5,1].png
deleted file mode 100644
index 4b98592df..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,NEXUS_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_5,1.5].png
deleted file mode 100644
index cbd17d019..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_5,1].png
deleted file mode 100644
index cbd17d019..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_C,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_C,1.5].png
deleted file mode 100644
index a76a2f345..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_C,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_C,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_C,1].png
deleted file mode 100644
index a76a2f345..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_Lighttheme_,PIXEL_C,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,NEXUS_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,NEXUS_5,1.5].png
deleted file mode 100644
index 1d6ba365f..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,NEXUS_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,NEXUS_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,NEXUS_5,1].png
deleted file mode 100644
index 728516d3c..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,NEXUS_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_5,1.5].png
deleted file mode 100644
index 48bde22fb..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_5,1].png
deleted file mode 100644
index 3353d9c7e..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_C,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_C,1.5].png
deleted file mode 100644
index badd21a6c..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_C,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_C,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_C,1].png
deleted file mode 100644
index db48d7df5..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui.component_null_DefaultGroup_TopAppBar_,PIXEL_C,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,NEXUS_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,NEXUS_5,1.5].png
deleted file mode 100644
index 8e2aa74c3..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,NEXUS_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,NEXUS_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,NEXUS_5,1].png
deleted file mode 100644
index 8e2aa74c3..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,NEXUS_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_5,1.5].png
deleted file mode 100644
index fd56438e3..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_5,1].png
deleted file mode 100644
index fd56438e3..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_C,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_C,1.5].png
deleted file mode 100644
index 52877df3d..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_C,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_C,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_C,1].png
deleted file mode 100644
index 52877df3d..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.core.ui_null_DefaultGroup_LoadingWheelLightPreview_,PIXEL_C,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,NEXUS_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,NEXUS_5,1.5].png
deleted file mode 100644
index 79dce8040..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,NEXUS_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,NEXUS_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,NEXUS_5,1].png
deleted file mode 100644
index 9e6edd41d..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,NEXUS_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_5,1.5].png
deleted file mode 100644
index 168a67ed0..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_5,1].png
deleted file mode 100644
index 2ab7776f7..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_C,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_C,1.5].png
deleted file mode 100644
index e13cc46e1..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_C,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_C,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_C,1].png
deleted file mode 100644
index 38058ef83..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_AuthorBodyPreview_,PIXEL_C,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,NEXUS_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,NEXUS_5,1.5].png
deleted file mode 100644
index 0ffe66c95..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,NEXUS_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,NEXUS_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,NEXUS_5,1].png
deleted file mode 100644
index 6bf7cdb9a..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,NEXUS_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_5,1.5].png
deleted file mode 100644
index 9a96abaea..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_5,1].png
deleted file mode 100644
index 152d6182d..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_C,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_C,1.5].png
deleted file mode 100644
index e48240f9b..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_C,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_C,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_C,1].png
deleted file mode 100644
index e27786b27..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenLoading_,PIXEL_C,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,NEXUS_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,NEXUS_5,1.5].png
deleted file mode 100644
index f72be4372..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,NEXUS_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,NEXUS_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,NEXUS_5,1].png
deleted file mode 100644
index 148036c4f..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,NEXUS_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_5,1.5].png
deleted file mode 100644
index 2cccbb759..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_5,1].png
deleted file mode 100644
index de832b38c..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_C,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_C,1.5].png
deleted file mode 100644
index b1429619c..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_C,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_C,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_C,1].png
deleted file mode 100644
index 8963a0724..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_ForYouScreenTopicSelection_,PIXEL_C,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,NEXUS_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,NEXUS_5,1.5].png
deleted file mode 100644
index 3ff920c09..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,NEXUS_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,NEXUS_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,NEXUS_5,1].png
deleted file mode 100644
index b837ddba3..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,NEXUS_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_5,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_5,1.5].png
deleted file mode 100644
index 5c4874bba..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_5,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_5,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_5,1].png
deleted file mode 100644
index 4011dd3ab..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_5,1].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_C,1.5].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_C,1.5].png
deleted file mode 100644
index 514eb04d1..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_C,1.5].png and /dev/null differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_C,1].png b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_C,1].png
deleted file mode 100644
index 2a1139ea1..000000000
Binary files a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_PopulatedFeed_,PIXEL_C,1].png and /dev/null differ