Merge "AudioService: fix stream aliasing update" into tm-qpr-dev