Merge "Resource and style clean up" into sc-dev