Merge "Fix showing hearing device icon for headphone device issue" into main