Merge "Use start time in SurfaceControl setFrameTimeline." into tm-dev