Merge "Fix launcher holds a surfaceController" into main am: 4b48398352

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

Change-Id: I1b9beba5e4ff06b338bc10ed618f60338e6e8d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>