Merge "Updated ImageVisual to handle native texture sampler" into devel/master