Merge "SF: Use VsyncSchedule's ID for EventThread" into main