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