Merge "Only use StyleManager if it really is available" into devel/master