Merge "Changed control defaults to listen to style change" into devel/master