Merge "Apply styling to grid" into sc-dev