Merge "Ensure crop rect is scaled appropriately."