Merge "Allow playing output to default output device when during uplink playback" into pi-dev