Merge "SF: keep HWVsync on as long as present fences are ignored" into main