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

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

Change-Id: I48c30029bb36dd9bd748972fe279a82892a2ebe0