Merge "Fix taskbar folder leave-behind not being drawn" into sc-v2-dev am: ee3814de1a am: 016a77ab56

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

Change-Id: If6e96d92e92eb51d6e9a77b817d3711bf874a000