Merge "InCallTonePlayer concurrency improvements." into tm-dev