Merge "The volume dialog window size should match content"