Merge "Revert "hal: ensure correct device selection when native playback is atvice""