Add another cherry-pick
Switch display-media to cherry-picks