Merge change 24872 into eclair

* changes:
  Fix issue 2115450: a2dp thread is started, even though we are only connected to headset and not playing music.