Merge "Fix benign integer overflow conditions for VSYNC add and removal."