Merge "Minor optimization for image visaul and texture manager" into devel/master