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

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

Change-Id: I94a79dc9eefb68fef97a95a9e1250faa8577c7d3