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

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

Change-Id: I8e40b5c0da07e836b1c60359c0bcc056af74c9f6