Merge "VolumePreference: fix audio sample playback"