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

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

Change-Id: I6273a3ebdf1170ba381de4da758759f3c6ef6cc6