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

Change-Id: I85b32e1a66009dc4818d79ba43df3c9ee8d85395