Merge "Fixed headset detection broken on stingray"