Merge "Add style name to indicator of ScrollBar" into devel/master