Merge "vsyncId should always be incremental" into sc-dev