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

Change-Id: I03f031fcb3ab599ba67ede3a73ae926265223fd7