Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev