Merge "Fix surface view lifecycle related bugs" into ub-launcher3-master am: d55964dfe2 am: 6d768c030a

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

Change-Id: Ic14bb6a5b2c561023ead5ac82fe73462feed8b50