Merge "SurfaceFlinger: check for nullptr on setFrameTimelineVsync"