Merge "Fix taskbar crash after cleanup" into sc-dev am: 5d225245b6

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

Change-Id: I1bebdd8af33f2665afdd413eb4863705a2e12334