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

Change-Id: Ie42d099b65bf3d90f47fb3bdd0d3b1cf9e850122