Merge "Turn on hole punch for PIP with caching" into sc-dev