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

Change-Id: I1a50655a43407fa5a04b380293a291deb2402a61