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: I2e4d46477b9771ce6f804060b4b991429789b070