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

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

Change-Id: I072b25cae46c2913ae74725fa8cf3b18f5395aca