Merge changes Ie4c31a23,Idf58c8c8 into tm-dev

* changes:
  Use only the audio timestamp frame position to detect underrun
  Fix avsync calculations in audio underrun test