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

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

Change-Id: I64c6c7a8a618c64acad54960377892e1e316361e