Merge "New small volume dialog"