Merge "AudioService: fix audio mode restoring" into sc-dev