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

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

Change-Id: I37858c7110c6772551c57716e6da6a774f9490cb