Merge "Switching overlays more correctly" into sc-dev am: b6d28e885d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icefb35d751e88416201a2497096ca1040f0f4321