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