Merge "Not using stale object to diagnose stale object" into sc-v2-dev am: 435e6a0443

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

Change-Id: I874048ccd1d2d308aabede724386db25174f893b