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