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

Change-Id: I79c7cc6b74ffbc7cd2b0b02b3efc7df907a75628