Merge "[Media] Simplify how we get the background color for the media player." into tm-dev