Merge "Task: Don't set crop for Organized surfaces." into rvc-dev