Merge "Updated ImageVisual to handle CPU Image Masking" into devel/master