Merge "Show media output header when calling" into main