Merge "audio policy: make input device selection more consistent" into pi-dev