Merge "Media control icon adjustments" into sc-dev