Merge "SF: use cached vsync period"