Merge "Revert "audiopolicy: align input and output devices for engine"" into qt-qpr1-dev