Merge "Use full bounds if fixed aspect ratio does not apply" into rvc-dev