Merge "Use USB product name to set AlsaDevice name" into main