Merge "AudioService: fix device spatial audio state persistence" into main