Merge "SF: fix frame timeline timestamp" into tm-dev