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