Merge "SF: Add defensive check on luma sampling"