Merge "Support volume-changed sounds on master-volume-only configs" into ics-aah