Merge "enable vsync configuration"