Merge "Merge \\"Restore setCropInTransaction HiddenForCrop behavior.\\" into nyc-dev am: 938a7014 am: 7b542a21" into nyc-mr1-dev-plus-aosp