Merge "Camera: make scale and crop test aspect ratio agnostic" into rvc-dev