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

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

Change-Id: I53529a2f0a90f4c4a71bd36c63b4793c8a683bfd