Merge "Simplify input-audio device mapping"