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