am 41a0a8d5: Merge "Don\'t start playing music after ending a call."

* commit '41a0a8d5b442007cbb069ef6a75debe1e24faf16':
  Don't start playing music after ending a call.