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

Change-Id: I15b07418a9bb7f1817619d0128207db72d8d796d