Merge "Correct HeadsetMediaButton behavior for external calls." into tm-dev