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

Change-Id: I2942f1d3037e1f46c72fca59757d4338f7a769b8