Merge "Add new constants for media output switch"