Merge "Update style name" into sc-dev