Merge "Added Scaling and cropping properties to the image visual mask" into devel...