Merge "Wait a bit longer to take screenshot" into rvc-dev