Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev