Merge "SF caching: Skip BT601_625 layers for caching and hole-punch" into sc-dev