Merge "Delete Unused internal methods in Visuals" into devel/master