Merge "Invalidate when switching to new consumer" into sc-dev am: bfb6274920

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

Change-Id: I90785801c2fce7a7060aee874325724bad6737ae