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

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

Change-Id: Id95bdabacfbc812d803bf5afc0e6b48b26f52326