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

Change-Id: Icdf87a01ba53834ec175cf9c14007f8e692a3068