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_phone_,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_phone_,NEXUS_5,1.5].png
new file mode 100644
index 000000000..5498ee220
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_phone_,NEXUS_5,1.5].png 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_phone_,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_phone_,NEXUS_5,1].png
new file mode 100644
index 000000000..e549bdc49
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_phone_,NEXUS_5,1].png 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_phone_,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_phone_,PIXEL_5,1.5].png
new file mode 100644
index 000000000..3d7fb4d47
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_phone_,PIXEL_5,1.5].png 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_phone_,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_phone_,PIXEL_5,1].png
new file mode 100644
index 000000000..3891d2be8
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_phone_,PIXEL_5,1].png 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_phone_,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_phone_,PIXEL_C,1.5].png
new file mode 100644
index 000000000..56ce2050b
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_phone_,PIXEL_C,1.5].png 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_phone_,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_phone_,PIXEL_C,1].png
new file mode 100644
index 000000000..e24791df8
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.author_null_DefaultGroup_phone_,PIXEL_C,1].png 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_phone_,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_phone_,NEXUS_5,1.5].png
new file mode 100644
index 000000000..73c81f81d
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_phone_,NEXUS_5,1.5].png 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_phone_,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_phone_,NEXUS_5,1].png
new file mode 100644
index 000000000..ebeacd5b9
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_phone_,NEXUS_5,1].png 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_phone_,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_phone_,PIXEL_5,1.5].png
new file mode 100644
index 000000000..056f7bcac
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_phone_,PIXEL_5,1.5].png 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_phone_,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_phone_,PIXEL_5,1].png
new file mode 100644
index 000000000..3d53c8f1b
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_phone_,PIXEL_5,1].png 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_phone_,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_phone_,PIXEL_C,1.5].png
new file mode 100644
index 000000000..41cc01f1f
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_phone_,PIXEL_C,1.5].png 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_phone_,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_phone_,PIXEL_C,1].png
new file mode 100644
index 000000000..d0c133148
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.foryou_null_DefaultGroup_phone_,PIXEL_C,1].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,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.interests_null_DefaultGroup_phone_,NEXUS_5,1.5].png
new file mode 100644
index 000000000..f3c09fa8a
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,NEXUS_5,1.5].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,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.interests_null_DefaultGroup_phone_,NEXUS_5,1].png
new file mode 100644
index 000000000..1d0cacb57
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,NEXUS_5,1].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,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.interests_null_DefaultGroup_phone_,PIXEL_5,1.5].png
new file mode 100644
index 000000000..3fb0e43e5
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,PIXEL_5,1.5].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,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.interests_null_DefaultGroup_phone_,PIXEL_5,1].png
new file mode 100644
index 000000000..3ebad69c2
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,PIXEL_5,1].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,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.interests_null_DefaultGroup_phone_,PIXEL_C,1.5].png
new file mode 100644
index 000000000..4d776f0e2
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,PIXEL_C,1.5].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,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.interests_null_DefaultGroup_phone_,PIXEL_C,1].png
new file mode 100644
index 000000000..3e6f79287
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.interests_null_DefaultGroup_phone_,PIXEL_C,1].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,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.topic_null_DefaultGroup_phone_,NEXUS_5,1.5].png
new file mode 100644
index 000000000..659224437
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,NEXUS_5,1.5].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,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.topic_null_DefaultGroup_phone_,NEXUS_5,1].png
new file mode 100644
index 000000000..58bd4b8c5
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,NEXUS_5,1].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,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.topic_null_DefaultGroup_phone_,PIXEL_5,1.5].png
new file mode 100644
index 000000000..cf0a7e0cd
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,PIXEL_5,1.5].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,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.topic_null_DefaultGroup_phone_,PIXEL_5,1].png
new file mode 100644
index 000000000..3e466bd3f
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,PIXEL_5,1].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,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.topic_null_DefaultGroup_phone_,PIXEL_C,1.5].png
new file mode 100644
index 000000000..49f68d2e1
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,PIXEL_C,1.5].png differ
diff --git a/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,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.topic_null_DefaultGroup_phone_,PIXEL_C,1].png
new file mode 100644
index 000000000..f4a279641
Binary files /dev/null and b/preview-screenshots/src/test/snapshots/images/com.google.samples.apps.nowinandroid_PreviewScreenshotTests_preview_tests[com.google.samples.apps.nowinandroid.feature.topic_null_DefaultGroup_phone_,PIXEL_C,1].png differ