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

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

Change-Id: If88644cb1e54ca7f46f732814c3a9531444ab29a