Merge "SurfaceFlinger: call setFrameTimelineVsyncForTransaction with valid id"