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

Change-Id: If643cd8c6c4ea1dc9efbf14db8467bd2b4976c06