Merge "SF: trace adjusted expected vsync time" into sc-dev