Merge "Remove flicker when dismissing snackbar" into sc-dev am: 2d8856537e

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

Change-Id: I96da9d1380c2131849080e7835ed30b2b17f16a2