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

Change-Id: I95831a9441b1a0bf8a01c4cdc9f0f59a35a3bb6c