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

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

Change-Id: If03bfa25f6ea9c312a3024460ed2bd008bdf17d4