Merge "Fix vsyncId for long frames and double stuffed"