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

Change-Id: I217dec32a12b6e6ee032e3011d7858cde4e1bb5d