Merge "Keep volume row visible if dialog is showing" into main