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

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

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