Merge "Fix incorrect getDeviceAndMixForInputSource matching logic"