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

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

Change-Id: Ibe6e0473c110d35509f1cdad4c24f2270e3b31d2