Merge "Cache hole punch, and flipped image shaders from pip" into sc-dev