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

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

Change-Id: I91ca5359a08b4d850896d2eec432e850cff52c76