Merge "Redesign HFP Client call handling"