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: I5adcd06fd364b3a2a1f2ceaa9f3bfe89fb8b9f0f