Merge "Work around for errant headsets." into gingerbread