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: I303d7d3fde15f53e54218bfeb2ba1d7a1edbd531