Merge "Trace vsync id" into sc-dev