Merge "Hide media type header when there's no media attached." into main