Merge "SF: Toggle VSYNC in EventThread with state machine"