Merge "SF: explicitly mark surface frame without a composite as non janky" into main