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

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

Change-Id: I55db57f76e9c9009f9ef82f22cf2527ba8648bce