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

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

Change-Id: I35766ede95fe4e73c883f7a187a23ba109ccb811