Merge "Revert "Invalidate when switching to new consumer"" into sc-dev