Merge "SF: Fix threshold for next VSYNC"