Merge "Fix tv volume control icon color" into sc-dev