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

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

Change-Id: I9f27e44763a152b8b2ba7a217d9a502d7c99d388