Merge "Wallpaper clean up as a result of getting rid of USE_SURFACE_VIEW_FOR_PREVIEW flag" into ub-launcher3-master am: 7ab870c1 am: 414574a0

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

Change-Id: If422c8c982c4de816ce7d956ae9a01fa14401dfd