Merge "Remove invalid calls to EnableVisual from Button" into devel/master