Merge "Fix bug where screenshot jumped to the left" into rvc-dev