Today
Merge from vsync_limit_fix