Merge "Moved StyleManager to the public API" into devel/master