Merge "Fix issue with invalid aspect ratio causing issues resizing" into rvc-dev