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

Change-Id: Ic7774b08707def59fbf8adb41f1076ba91d3e75c