Merge "SF: add vsyncId to SurfaceFlinger::composite trace" into tm-dev