Merge "Minor cleanup for ThemeOptionPreviewer" into ub-launcher3-master am: 78da8815 am: cce7e5e0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/11986925

Change-Id: I150ba02a020c1490f4109e9c1ba7723f43d2e944