Merge "Fixed CropLatchingTest that was failing"