Merge "AudioService: refactor audio mode stack" into sc-dev