Merge "Adjust the volume dialog for non-mobile platforms"