Merge "Fixing Launcher preview leaking surface and memory" into sc-dev am: 50308f3750

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

Change-Id: I79fa2f446f2f587468c691c47ed77c59dc201900