Merge "Restore setCropInTransaction HiddenForCrop behavior." into nyc-dev