Merge "Use full bounds if fixed aspect ratio does not apply" into rvc-dev am: 0350a0c4 am: 3650c991 Change-Id: Iee535294c57a6fcc588aeba216ba14fb132e3e64