Merge "Fixed automatic naming of visuals for non-native controls" into devel/master