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

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

Change-Id: Iaa45a444c15c936a0b5b35193ba0a3c660650c47