Merge "Use system colors for media" into sc-dev