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

Change-Id: I7da6c6207d88c3472fec8e3e268327ad7046ceb5