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

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

Change-Id: I20c1aa3f1ac034c7693aefbd270d8a4a6a1011ac