Merge "Do some additional cleanup when switching handlers" into sc-dev am: caabfa1519 am: a9a53a339f am: c2ea4e8cb2

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

Change-Id: I0caf3a5d483e957172e80f8e45f4224988a0fe0c