Merge "Avoid calling onVsyncGenerated when vrrConfig is not available" into main