Merge "No need to remove callback and call surface.release in GridOptionPreviewer" into ub-launcher3-master am: fbc4732b94 am: 80ba3a8fb7

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

Change-Id: I43b570c08476621781a4b04a060bad123316c445