Merge "Support skipping CachedSet rendering based on invalidate() proximity" into sc-dev