Merge "Always recreate the SurfaceView when updating the grid preview" into tm-dev am: 64ebc35b

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



Change-Id: I009a25b3a95f9676df33e465d2e5408b6eb8a713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>