Merge "Fix screenshot scaling bug" into rvc-dev