Merge "Fix testScreenCaptureDisabled" into rvc-dev