Merge "HFP: Fix headset state transition on device replacement"