Merge "Fix taskbar being empty" into sc-v2-dev am: 0e0e1cef09 am: 8dedf2f6bc

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

Change-Id: I103a05b42d340653aec6d1328402037fcf7db783