Merge "Waiting for NexusLauncher to go away after swiping up from menu" into sc-dev am: 4e77d8f85f am: ee4f665df2

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

Change-Id: Ied5849d61300299c9fe0d2e936d4aa895ff8ac20