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

Change-Id: I4c26cf6d27d6b810fc64636cc05204ef087ea6eb