Merge "Fix Volume Dialog button size" into main