Merge "TextVisual shows text after being Disabled and Enabled" into devel/master