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

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

Change-Id: I5fe4feb7cb9963cec898f3b8adc633015aefb6e2