Merge "HFP: Fix headset state transition on device replacement" into oc-mr1-dev