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