Merge "Use buffer to log media timeout events" into tm-dev