Merge "Bugfix: dnd icon overlapping media volume icon" into main