Sometimes the mapping description gets duplicated, resulting in devices being labeled in pavucontrol like "Built-in Audio Speaker + Speaker". Check that these strings are different so we get "Built-in Audio Speaker" instead of that.
I encountered this while testing !290 (closed), see the second screenshot in my comment there.