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

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

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