Merge "SF: add a solid background when hole punching a cached set" into sc-dev