Merge "sf-caching: Skip hole punch for layer that blends" into tm-dev