Merge "SF: Remove setFinalCrop impl 2/2"