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

Change-Id: I8b9245f4f214778f1a82001756a3f9f3967de96f