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