Merge "SF: Remove setFinalCrop impl 1/2"