Merge \"Restore setCropInTransaction HiddenForCrop behavior.\" into nyc-dev
am: 938a70142e

Change-Id: Ica7e5c31c1c08f9424b5eb44ab843c3ce2526914