Merge "Revert "Invalidate when switching to new consumer"" into sc-dev am: 3956b3ea84

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

Change-Id: I3e09dce402c1cda7e0c161c2a37bde79a1fb5b36