Merge "aaudio: preserve requested device ID, fix regression" into tm-qpr-dev