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

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

Change-Id: I392ba360d06764df7a4305d43054ee0498eae559