Merge "Make headset icons consistent before / after pairing"