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