Merge "Reset activity reference after invalidation" into sc-dev am: f5278b0b23

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

Change-Id: Ibac95a7fdfefff735f58614ea587b1b92381cfa5