Merge "Add tracepoints when clients use vsyncids from a different choreographer" into main