Merge "Changed signal order for StyleManager" into devel/master