Merge "Some cleanup for handler invalidation" into sc-dev am: 739420bc38

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

Change-Id: I4190af1777e00723d4ed64d5e24c511bf69b3deb