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: Ie1ec7e6050d4b2475b7843f0397a91cd1dc6f8f6