Merge "Add an extra for the Disconnect Headset State." into froyo