Merge "Added setBufferCrop to setGeometry" into sc-dev