Merge "SF: Avoid adjusting Vsync Timeline when minFramePeriod isn't violated" into main