Merge "Fix media output click component behaviour:" into main