Merge "Fix media output component appearance" into main