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: I83db9c08b56d9756bfdfca2a85718d37b6bbc20f